# HG changeset patch
# User bcoudurier
# Date 1278023491 0
# Node ID da46dcc05d4af45867873b8426b433ddbd4a4654
# Parent  71862ed5b87467d10150fda362f7ff9a1ab74389
Use ext sample from mpeg4audio config if set with AAC SBR

diff -r 71862ed5b874 -r da46dcc05d4a flvdec.c
--- a/flvdec.c	Thu Jul 01 20:15:49 2010 +0000
+++ b/flvdec.c	Thu Jul 01 22:31:31 2010 +0000
@@ -414,7 +414,10 @@
                 ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                          st->codec->extradata_size);
                 st->codec->channels = cfg.channels;
-                st->codec->sample_rate = cfg.sample_rate;
+                if (cfg.ext_sample_rate)
+                    st->codec->sample_rate = cfg.ext_sample_rate;
+                else
+                    st->codec->sample_rate = cfg.sample_rate;
                 dprintf(s, "mp4a config channels %d sample rate %d\n",
                         st->codec->channels, st->codec->sample_rate);
             }
diff -r 71862ed5b874 -r da46dcc05d4a mov.c
--- a/mov.c	Thu Jul 01 20:15:49 2010 +0000
+++ b/mov.c	Thu Jul 01 22:31:31 2010 +0000
@@ -535,8 +535,10 @@
                 st->codec->channels = cfg.channels;
                 if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4
                     st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index];
+                else if (cfg.ext_sample_rate)
+                    st->codec->sample_rate = cfg.ext_sample_rate;
                 else
-                    st->codec->sample_rate = cfg.sample_rate; // ext sample rate ?
+                    st->codec->sample_rate = cfg.sample_rate;
                 dprintf(fc, "mp4a config channels %d obj %d ext obj %d "
                         "sample rate %d ext sample rate %d\n", st->codec->channels,
                         cfg.object_type, cfg.ext_object_type,