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:
41e9682
)
aacdec: Turn PS off when switching to stereo and turn it to implicit when switching...
author
Alex Converse
<alex.converse@gmail.com>
Tue, 22 May 2012 21:43:28 +0000
(14:43 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Mon, 4 Jun 2012 22:16:17 +0000
(15:16 -0700)
libavcodec/aacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec.c
b/libavcodec/aacdec.c
index
bd5ba00
..
ddc7eef
100644
(file)
--- a/
libavcodec/aacdec.c
+++ b/
libavcodec/aacdec.c
@@
-461,6
+461,7
@@
static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
return NULL;
ac->oc[1].m4ac.chan_config = 2;
+ ac->oc[1].m4ac.ps = 0;
}
// And vice-versa
if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2) {
@@
-476,6
+477,8
@@
static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
return NULL;
ac->oc[1].m4ac.chan_config = 1;
+ if (ac->oc[1].m4ac.sbr)
+ ac->oc[1].m4ac.ps = -1;
}
// For indexed channel configurations map the channels solely based on position.
switch (ac->oc[1].m4ac.chan_config) {