[FFmpeg-cvslog] Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 20:47:13 2015 +0200| [a9aed08fa4e94b19afe343b11e6eea117da5408a] | committer: Michael Niedermayer

Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'

* commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f':
  fate: Update ac3 test to the new request_channel_layout option

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9aed08fa4e94b19afe343b11e6eea117da5408a
---