diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 00:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-22 12:27:24 +0200 |
| commit | 38c8264d193c0093b78a9394f06b98529ac8a433 (patch) | |
| tree | db5b8d3e48e1e26930b851b5e869e3c5fda7315f | |
| parent | a43f9e6895fed3a2feb3a24491f528a3a4c153f1 (diff) | |
| download | ffmpeg-38c8264d193c0093b78a9394f06b98529ac8a433.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 407125713c..e564f118ab 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -423,7 +423,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; |