[FFmpeg-cvslog] Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 16:12:05 2013 +0100| [1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b] | committer: Michael Niedermayer

Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'

* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
  mlpdec: set the channel layout.

Conflicts:
	libavcodec/mlpdec.c

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

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