[FFmpeg-cvslog] Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 04:21:10 2013 +0100| [3f41e57fa869036e42bf26dfaccf0c7b28d0bd19] | committer: Michael Niedermayer

Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'

* commit '220494ad0b2e9e980ef703b46b69308236f29be5':
  dcadec: treat all 2-channel modes as Stereo in dca_downmix.

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

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