Mercurial > libavformat.hg

changeset 4009:f492dad79579 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
author bcoudurier
date Fri, 24 Oct 2008 23:06:03 +0000
parents 8af7a177b17d
children de8c9fae9f5c
files flvdec.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/flvdec.c	Fri Oct 24 21:41:27 2008 +0000
+++ b/flvdec.c	Fri Oct 24 23:06:03 2008 +0000
@@ -388,10 +388,7 @@
     if(is_audio){
         if(!st->codec->sample_rate || !st->codec->bits_per_coded_sample || (!st->codec->codec_id && !st->codec->codec_tag)) {
             st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
-            if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8KHZ_MONO)
-                st->codec->sample_rate= 8000;
-            else
-                st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
+            st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
             st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
             flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
         }