[FFmpeg-cvslog] aacdec: Fix PS in ADTS.

[Alex Converse]

ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Nov 22 12:12:10 2011 -0800| [963f6855356fa527a27b08b55e026f683a12cebc] | committer: Alex Converse

aacdec: Fix PS in ADTS.

Fixes File1.aac and Bug 80.

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

 libavcodec/aacdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 203ecd3..1015030 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2085,7 +2085,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
             ac->m4ac.chan_config = hdr_info.chan_config;
             if (set_default_channel_config(ac->avctx, new_che_pos, hdr_info.chan_config))
                 return -7;
-            if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, OC_TRIAL_FRAME))
+            if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config,
+                                 FFMAX(ac->output_configured, OC_TRIAL_FRAME)))
                 return -7;
         } else if (ac->output_configured != OC_LOCKED) {
             ac->m4ac.chan_config = 0;