diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-12-02 09:07:32 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-12-02 09:07:32 +0000 |
| commit | 38610d92ff1f3103422b8ceec70e5fbeb942a15c (patch) | |
| tree | 295416a3a11ab6646fa0f553fc246ecb9b9d5f16 /libavcodec | |
| parent | 9d8bb0318a0bc59a04c71555a3c575f8146eab41 (diff) | |
| download | ffmpeg-38610d92ff1f3103422b8ceec70e5fbeb942a15c.tar.gz | |
Set the SBR mode to implicit on ADTS frames occurring before the output is locked.
Originally committed as revision 20700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 5c58f97ce9..ad5de7c5c7 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -1687,6 +1687,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) } else if (ac->output_configured != OC_LOCKED) { ac->output_configured = OC_NONE; } + if (ac->output_configured != OC_LOCKED) + ac->m4ac.sbr = -1; ac->m4ac.sample_rate = hdr_info.sample_rate; ac->m4ac.sampling_index = hdr_info.sampling_index; ac->m4ac.object_type = hdr_info.object_type; |