diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 00:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-25 15:06:54 +0200 |
| commit | 2adcdf50844a541ccec0da0474adf28cddc51ff3 (patch) | |
| tree | 1c2fe64528e91fae37a18e20e5ada7b7511c958b | |
| parent | 4191e01e9906a88f4686ee2e20928538da3d4b96 (diff) | |
| download | ffmpeg-2adcdf50844a541ccec0da0474adf28cddc51ff3.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>
| -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 10c509be82..7d802e8517 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -425,7 +425,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; |