diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-06 17:30:09 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-03-09 09:47:57 -0800 |
| commit | 744dd1d35611b8dec7727d0f676bb44742ad49a1 (patch) | |
| tree | 5f9751941078e08e0ae03501ad84dd9366c9f827 | |
| parent | d53fe096e4d0d0e4db2859e467515de1a0ef91fa (diff) | |
| download | ffmpeg-744dd1d35611b8dec7727d0f676bb44742ad49a1.tar.gz | |
aacdec: Fix SCE parity check.
An unpaired SCE preceding a CPE only makes sense for front SCEs
preceding the first CPE.
Split from FFmpeg commit a8d67efa53dae1d14614e3a7bd4e77e4eab066ab
Signed-off-by: Alex Converse <alex.converse@gmail.com>
| -rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c7c11c9e5f..6cfc7dac9c 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -200,7 +200,7 @@ static int count_paired_channels(uint8_t (*layout_map)[3], int tags, int pos, in break; if (layout_map[i][0] == TYPE_CPE) { if (sce_parity) { - if (pos == AAC_CHANNEL_FRONT || !first_cpe) { + if (pos == AAC_CHANNEL_FRONT && !first_cpe) { sce_parity = 0; } else { return -1; |