Mercurial > libavcodec.hg

changeset 9716:d45e44454d13 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In the event of a mismatch, do not follow the sample rate index in an AAC PCE. This matches the behavior the reference decoder and fixes issue 1072.
author alexc
date Tue, 26 May 2009 21:34:56 +0000
parents 997d2de9cd84
children 5ebac9debadf
files aac.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/aac.c	Tue May 26 17:04:28 2009 +0000
+++ b/aac.c	Tue May 26 21:34:56 2009 +0000
@@ -231,12 +231,9 @@
     skip_bits(gb, 2);  // object_type
 
     sampling_index = get_bits(gb, 4);
-    if(sampling_index > 12) {
-        av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
-        return -1;
-    }
-    ac->m4ac.sampling_index = sampling_index;
-    ac->m4ac.sample_rate = ff_mpeg4audio_sample_rates[ac->m4ac.sampling_index];
+    if (ac->m4ac.sampling_index != sampling_index)
+        av_log(ac->avccontext, AV_LOG_WARNING, "Sample rate index in program config element does not match the sample rate index configured by the container.\n");
+
     num_front       = get_bits(gb, 4);
     num_side        = get_bits(gb, 4);
     num_back        = get_bits(gb, 4);