8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15632 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/flv.h b/libavformat/flv.h
index efa8cebe8ac1b58d8766be9e6052b6bcf015fe17..89d0d10ffe3c1e9a66fc5aa7b1ae4a34645e0083 100644 (file)
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -71,14 +71,14 @@ enum {
 };
 
 enum {
-    FLV_CODECID_PCM                 = 0,
-    FLV_CODECID_ADPCM               = 1 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_MP3                 = 2 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_PCM_LE              = 3 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_AAC                 = 10<< FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_SPEEX               = 11<< FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_PCM                  = 0,
+    FLV_CODECID_ADPCM                = 1 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_MP3                  = 2 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_PCM_LE               = 3 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_NELLYMOSER_8KHZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_NELLYMOSER           = 6 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_AAC                  = 10<< FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_SPEEX                = 11<< FLV_AUDIO_CODECID_OFFSET,
 };
 
 enum {

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index e548fb4a8504932a7d88badfb34b2ffa0b083a9d..58861bb2345361b4c87834206e97c0711d294f91 100644 (file)
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -55,7 +55,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
         case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF;                              break;
         case FLV_CODECID_SPEEX: acodec->codec_id = CODEC_ID_SPEEX;                                  break;
         case FLV_CODECID_MP3  : acodec->codec_id = CODEC_ID_MP3      ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
-        case FLV_CODECID_NELLYMOSER_8HZ_MONO:
+        case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
             acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
         case FLV_CODECID_NELLYMOSER:
             acodec->codec_id = CODEC_ID_NELLYMOSER;
@@ -384,7 +384,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_8HZ_MONO)
+            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);