From 44de39f93c57f3761a00a85dc459decc3fdc1839 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 24 Feb 2008 00:57:15 +0000
Subject: [PATCH] flv/swf do not have a big endian codec id, they only support
little endian and native endian.
Originally committed as revision 12183 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/flv.h | 2 +-
libavformat/flvdec.c | 2 +-
libavformat/flvenc.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/flv.h b/libavformat/flv.h
index 59418390e4f..4501527aa65 100644
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -71,7 +71,7 @@ enum {
};
enum {
- FLV_CODECID_PCM_BE = 0,
+ 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,
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 46270c2e5a5..7cd994428d1 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -41,7 +41,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
AVCodecContext *acodec = astream->codec;
switch(flv_codecid) {
//no distinction between S16 and S8 PCM codec flags
- case FLV_CODECID_PCM_BE:
+ case FLV_CODECID_PCM:
acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16BE; break;
case FLV_CODECID_PCM_LE:
acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break;
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 2842faf5b25..e5270ca320d 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -35,8 +35,8 @@ static const AVCodecTag flv_video_codec_ids[] = {
static const AVCodecTag flv_audio_codec_ids[] = {
{CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET},
- {CODEC_ID_PCM_S8, FLV_CODECID_PCM_BE >> FLV_AUDIO_CODECID_OFFSET},
- {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM_BE >> FLV_AUDIO_CODECID_OFFSET},
+ {CODEC_ID_PCM_S8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
+ {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_NONE, 0}
@@ -84,10 +84,10 @@ static int get_audio_flags(AVCodecContext *enc){
flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT;
break;
case CODEC_ID_PCM_S8:
- flags |= FLV_CODECID_PCM_BE | FLV_SAMPLESSIZE_8BIT;
+ flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_8BIT;
break;
case CODEC_ID_PCM_S16BE:
- flags |= FLV_CODECID_PCM_BE | FLV_SAMPLESSIZE_16BIT;
+ flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_16BIT;
break;
case CODEC_ID_PCM_S16LE:
flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT;
--
GitLab