generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AAC: Fix regression introduced in r20067 where ADTS files would always be

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac.c
View File

@@ -1682,7 +1682,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
ac->m4ac.chan_config = hdr_info.chan_config; ac->m4ac.chan_config = hdr_info.chan_config;
if (set_default_channel_config(ac, new_che_pos, hdr_info.chan_config)) if (set_default_channel_config(ac, new_che_pos, hdr_info.chan_config))
return -7; 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; return -7;
} }
ac->m4ac.sample_rate = hdr_info.sample_rate; ac->m4ac.sample_rate = hdr_info.sample_rate;