1. ffmpeg
  2. Commit 88cb61bb0cf2efe2f2015ae4da76f941920d009a
Browse code

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

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

Alexander Wichers authored on 2008/10/18 21:08:55
Showing 2 changed files
libavformat/flv.h
History View file @ 88cb61b
... ... 
@@ -71,14 +71,14 @@ enum {
71 71 
 };
72 72
73 73 
 enum {
74 
-    FLV_CODECID_PCM                 = 0,
75 
-    FLV_CODECID_ADPCM               = 1 << FLV_AUDIO_CODECID_OFFSET,
76 
-    FLV_CODECID_MP3                 = 2 << FLV_AUDIO_CODECID_OFFSET,
77 
-    FLV_CODECID_PCM_LE              = 3 << FLV_AUDIO_CODECID_OFFSET,
78 
-    FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
79 
-    FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET,
80 
-    FLV_CODECID_AAC                 = 10<< FLV_AUDIO_CODECID_OFFSET,
81 
-    FLV_CODECID_SPEEX               = 11<< FLV_AUDIO_CODECID_OFFSET,
74 
+    FLV_CODECID_PCM                  = 0,
75 
+    FLV_CODECID_ADPCM                = 1 << FLV_AUDIO_CODECID_OFFSET,
76 
+    FLV_CODECID_MP3                  = 2 << FLV_AUDIO_CODECID_OFFSET,
77 
+    FLV_CODECID_PCM_LE               = 3 << FLV_AUDIO_CODECID_OFFSET,
78 
+    FLV_CODECID_NELLYMOSER_8KHZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
79 
+    FLV_CODECID_NELLYMOSER           = 6 << FLV_AUDIO_CODECID_OFFSET,
80 
+    FLV_CODECID_AAC                  = 10<< FLV_AUDIO_CODECID_OFFSET,
81 
+    FLV_CODECID_SPEEX                = 11<< FLV_AUDIO_CODECID_OFFSET,
82 82 
 };
83 83
84 84 
 enum {
libavformat/flvdec.c
History View file @ 88cb61b
... ... 
@@ -55,7 +55,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
55 55 
         case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF;                              break;
56 56 
         case FLV_CODECID_SPEEX: acodec->codec_id = CODEC_ID_SPEEX;                                  break;
57 57 
         case FLV_CODECID_MP3  : acodec->codec_id = CODEC_ID_MP3      ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
58 
-        case FLV_CODECID_NELLYMOSER_8HZ_MONO:
58 
+        case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
59 59 
             acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
60 60 
         case FLV_CODECID_NELLYMOSER:
61 61 
             acodec->codec_id = CODEC_ID_NELLYMOSER;
... ... 
@@ -384,7 +384,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
384 384 
     if(is_audio){
385 385 
         if(!st->codec->sample_rate || !st->codec->bits_per_coded_sample || (!st->codec->codec_id && !st->codec->codec_tag)) {
386 386 
             st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
387 
-            if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO)
387 
+            if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8KHZ_MONO)
388 388 
                 st->codec->sample_rate= 8000;
389 389 
             else
390 390 
                 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);