From 88cb61bb0cf2efe2f2015ae4da76f941920d009a Mon Sep 17 00:00:00 2001
From: Alexander Wichers <development@wichers.nu>
Date: Sat, 18 Oct 2008 12:08:55 +0000
Subject: [PATCH] 8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development
at wichersdot nu
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/flv.h | 16 ++++++++--------
libavformat/flvdec.c | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavformat/flv.h b/libavformat/flv.h
index efa8cebe8ac..89d0d10ffe3 100644
--- 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 e548fb4a850..58861bb2345 100644
--- 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);
--
GitLab