[FFmpeg-cvslog] Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  8 17:31:01 2014 +0100| [aedc10137de0bdbae01828179bfc0ee61d5fe6b2] | committer: Michael Niedermayer

Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'

* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c':
  mlp: improve request_channel_layout behavior.

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

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