diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 00:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-16 16:03:24 +0200 |
| commit | 684f86391d3d014790a981eb1531ae25f2f6d6a2 (patch) | |
| tree | fbd1e60eca6c576740a337ba3e8e1917742aeb4f | |
| parent | 2b69da7b5ac3b6f96847f350f3f03c30b82832e9 (diff) | |
| download | ffmpeg-684f86391d3d014790a981eb1531ae25f2f6d6a2.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 3586aabbe7..e6405f0f10 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; |