[FFmpeg-cvslog] Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 22:27:34 2014 +0100| [bc7f76377c1e8850af163646a98ab086a84f5d66] | committer: Michael Niedermayer

Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'

* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c':
  dcadec: set the output channel mode more accurately.

Conflicts:
	libavcodec/dcadec.c

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

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