diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 00:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 22:01:46 +0200 |
| commit | bcc4c360aadff39907b185f9de88fdf9ac91e7cf (patch) | |
| tree | 99980c375ab56f0bed478071a68330539c985ab2 /libavcodec/aacdec.c | |
| parent | 8be177e048cef56d9d5ad267afa183489a721b00 (diff) | |
| download | ffmpeg-bcc4c360aadff39907b185f9de88fdf9ac91e7cf.tar.gz | |
avcodec/aacdec: Fix storing state before PCE decode
Fixes Ticket4460
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e88b3852aefaa39b2170ef185ad03dda18732821)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
| -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 daec5bc355..5a0c05a686 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -424,7 +424,7 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) * Save current output configuration if and only if it has been locked. */ static void push_output_configuration(AACContext *ac) { - if (ac->oc[1].status == OC_LOCKED) { + if (ac->oc[1].status == OC_LOCKED || ac->oc[0].status == OC_NONE) { ac->oc[0] = ac->oc[1]; } ac->oc[1].status = OC_NONE; |