RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-29 04:21:10 +01:00
parent 97468463a2 220494ad0b
commit 3f41e57fa8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dcadec.c
View File

@ -1162,13 +1162,13 @@ static void dca_downmix(float **samples, int srcfmt, int lfe_present,
switch (srcfmt) {
case DCA_MONO:
case DCA_CHANNEL:
case DCA_STEREO_TOTAL:
case DCA_STEREO_SUMDIFF:
case DCA_4F2R:
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];