diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:21:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:21:34 +0100 |
| commit | 3f41e57fa869036e42bf26dfaccf0c7b28d0bd19 (patch) | |
| tree | 32db7606a8b004ea195167094cc5069cd8dc7a1b /libavcodec/dcadec.c | |
| parent | 97468463a239a6767a9c7ad0ed2f9f03e61f5d1a (diff) | |
| parent | 220494ad0b2e9e980ef703b46b69308236f29be5 (diff) | |
| download | ffmpeg-3f41e57fa869036e42bf26dfaccf0c7b28d0bd19.tar.gz | |
Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'
* commit '220494ad0b2e9e980ef703b46b69308236f29be5':
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 3e3a562d7c..8490c1e7e8 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -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]; |