diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-02-12 13:31:43 +0000 |
|---|---|---|
| committer | Robert Swain <robert.swain@gmail.com> | 2009-02-12 13:31:43 +0000 |
| commit | 30272450f98473dee6f6d06e42cae37c3787ebf8 (patch) | |
| tree | 00293e458c67b914e3ce0f96bbb9b82dc1fc8bfd /libavcodec/aac.c | |
| parent | ff587009ae60f6cf76d70879986125696490f99c (diff) | |
| download | ffmpeg-30272450f98473dee6f6d06e42cae37c3787ebf8.tar.gz | |
Add support for sample rate index 12, 7350 Hz
Patch by Alex Converse ( alex converse gmail com )
Originally committed as revision 17180 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.c')
| -rw-r--r-- | libavcodec/aac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 4273e796be..57bafda0a6 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -173,7 +173,7 @@ static int decode_pce(AACContext * ac, enum ChannelPosition new_che_pos[4][MAX_E skip_bits(gb, 2); // object_type sampling_index = get_bits(gb, 4); - if(sampling_index > 11) { + if(sampling_index > 12) { av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); return -1; } @@ -326,7 +326,7 @@ static int decode_audio_specific_config(AACContext * ac, void *data, int data_si if((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0) return -1; - if(ac->m4ac.sampling_index > 11) { + if(ac->m4ac.sampling_index > 12) { av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); return -1; } @@ -1555,7 +1555,7 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n"); return -1; } - if (ac->m4ac.sampling_index > 11) { + if (ac->m4ac.sampling_index > 12) { av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); return -1; } |