[FFmpeg-cvslog] r20193 - trunk/libavcodec/aac.c

[superdump]

Author: superdump
Date: Fri Oct  9 17:38:44 2009
New Revision: 20193

Log:
AAC: Fix regression introduced in r20067 where ADTS files would always be
signalled as having a channel configuration of 1 in output_configure().
Previously this didn't matter but it does now.

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Thu Oct  8 16:40:14 2009	(r20192)
+++ trunk/libavcodec/aac.c	Fri Oct  9 17:38:44 2009	(r20193)
@@ -1682,7 +1682,7 @@ static int parse_adts_frame_header(AACCo
             ac->m4ac.chan_config = hdr_info.chan_config;
             if (set_default_channel_config(ac, new_che_pos, hdr_info.chan_config))
                 return -7;
-            if (output_configure(ac, ac->che_pos, new_che_pos, 1))
+            if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config))
                 return -7;
         }
         ac->m4ac.sample_rate     = hdr_info.sample_rate;