diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-11-22 22:59:54 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-28 22:02:53 +0100 |
| commit | 220494ad0b2e9e980ef703b46b69308236f29be5 (patch) | |
| tree | 42a3d22badb2616301a97c36dcb875523eaa82e5 | |
| parent | aaa44d0299338e3bc90128816c21dbfab06cdb48 (diff) | |
| download | ffmpeg-220494ad0b2e9e980ef703b46b69308236f29be5.tar.gz | |
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
The check for (prim_channels > 2) before calling dca_downmix made these
cases unreachable, but now 2.1 layouts will go through the downmix code.
Having dual mono, Lt/Rt and sum-difference layouts print errors when
regular Stereo doesn't seems pointless.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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 cd4f18825b..0b513898a7 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1001,13 +1001,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, 0, "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]; |