From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri, 24 Oct 2008 23:06:03 +0000 (+0000)
Subject: simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser... 
X-Git-Tag: v0.5~2119
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f8cd075e0f6a83c2d55cffaa5545776602125fd;p=coroid%2Flibav_saccubus.git

simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz

Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index b51c72ee1..08008836f 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -388,10 +388,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
     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);
         }