1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-26 14:14:54 +02:00

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.

Originally committed as revision 20193 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Robert Swain 2009-10-09 15:38:44 +00:00
parent 144fec83b3
commit 0359289d1d

View File

@ -1682,7 +1682,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
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;