[FFmpeg-cvslog] Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 12:09:42 2014 +0200| [ef13967e601bb0851af04182ea2aeeea8a3025bd] | committer: Michael Niedermayer

Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'

* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
  flacdec: do not overwrite a channel layout set by the caller

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

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