[FFmpeg-cvslog] aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono .

[Alex Converse]

ffmpeg | branch: release/0.11 | Alex Converse <alex.converse at gmail.com> | Tue May 22 14:43:28 2012 -0700| [f9fc08de658bd06278a77636a1a5d2c9fbe7d277] | committer: Michael Niedermayer

aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.
(cherry picked from commit 79c8e29a7e404dbcf670df599fad6894f98ccab2)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9fc08de658bd06278a77636a1a5d2c9fbe7d277
---

 libavcodec/aacdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index d4f48bb..3118ee7 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -487,6 +487,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) {
@@ -504,6 +505,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) {