Mercurial > libavformat.hg

diff mov.c @ 6210:da46dcc05d4a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use ext sample from mpeg4audio config if set with AAC SBR
author bcoudurier
date Thu, 01 Jul 2010 22:31:31 +0000
parents d81e41261983
children 6f6ecca6904a
line wrap: on
line diff
--- 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,