diff options
| author | Robert Swain <robert.swain@gmail.com> | 2009-10-09 15:38:44 +0000 |
|---|---|---|
| committer | Robert Swain <robert.swain@gmail.com> | 2009-10-09 15:38:44 +0000 |
| commit | 0359289d1d2ac9f57a1d10f26c0e7b23c5a05230 (patch) | |
| tree | ae2135a9c3dacf1624aed96b36ae0d415d465b30 /libavcodec/aac.c | |
| parent | 144fec83b3abd42ac361b3c964467dff5a1ac958 (diff) | |
| download | ffmpeg-streaming-0359289d1d2ac9f57a1d10f26c0e7b23c5a05230.zip ffmpeg-streaming-0359289d1d2ac9f57a1d10f26c0e7b23c5a05230.tar.gz | |
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
Diffstat (limited to 'libavcodec/aac.c')
| -rw-r--r-- | libavcodec/aac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 68a007b..5387740 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -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; |
