projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f89584c
)
aacdec: Don't fall back to the old output configuration when no old configuration...
author
Alex Converse
<alex.converse@gmail.com>
Tue, 7 Aug 2012 19:19:58 +0000
(12:19 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Wed, 8 Aug 2012 23:55:41 +0000
(16:55 -0700)
Fixes MP4 files where the first frame is broken.
libavcodec/aacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec.c
b/libavcodec/aacdec.c
index
958c9d2
..
1c59ec5
100644
(file)
--- a/
libavcodec/aacdec.c
+++ b/
libavcodec/aacdec.c
@@
-365,7
+365,7
@@
static void push_output_configuration(AACContext *ac) {
* configuration is unlocked.
*/
static void pop_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[1] = ac->oc[0];
ac->avctx->channels = ac->oc[1].channels;
ac->avctx->channel_layout = ac->oc[1].channel_layout;