Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'

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

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

diff --cc libavcodec/dcadec.c
index 3e3a562,0b51389..8490c1e
--- 1/libavcodec/dcadec.c
--- 2/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@@ -1162,13 -1001,13 +1162,13 @@@ static void dca_downmix(float **samples
  
      switch (srcfmt) {
      case DCA_MONO:
-     case DCA_CHANNEL:
-     case DCA_STEREO_TOTAL:
-     case DCA_STEREO_SUMDIFF:
      case DCA_4F2R:
 -        av_log(NULL, 0, "Not implemented!\n");
 +        av_log(NULL, AV_LOG_ERROR, "Not implemented!\n");
          break;
+     case DCA_CHANNEL:
      case DCA_STEREO:
+     case DCA_STEREO_TOTAL:
+     case DCA_STEREO_SUMDIFF:
          break;
      case DCA_3F:
          c = channel_mapping[0];