[FFmpeg-cvslog] Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 16:34:34 2013 +0100| [86b892af199d420fe2bcf5f8fb96c377d924ad43] | committer: Michael Niedermayer

Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'

* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
  mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

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

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