# HG changeset patch
# User bcoudurier
# Date 1224889563 0
# Node ID f492dad79579fa10a77eb7550cfbdda353a09cff
# Parent  8af7a177b17d0b61495eef4221886e69e51f9c2a
simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz

diff -r 8af7a177b17d -r f492dad79579 flvdec.c
--- 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);
         }