[FFmpeg-cvslog] r12183 - in trunk/libavformat: flv.h flvdec.c flvenc.c
michael
subversion
Sun Feb 24 01:57:15 CET 2008
Author: michael
Date: Sun Feb 24 01:57:15 2008
New Revision: 12183
Log:
flv/swf do not have a big endian codec id, they only support
little endian and native endian.
Modified:
trunk/libavformat/flv.h
trunk/libavformat/flvdec.c
trunk/libavformat/flvenc.c
Modified: trunk/libavformat/flv.h
==============================================================================
--- trunk/libavformat/flv.h (original)
+++ trunk/libavformat/flv.h Sun Feb 24 01:57:15 2008
@@ -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,
Modified: trunk/libavformat/flvdec.c
==============================================================================
--- trunk/libavformat/flvdec.c (original)
+++ trunk/libavformat/flvdec.c Sun Feb 24 01:57:15 2008
@@ -41,7 +41,7 @@ static void flv_set_audio_codec(AVFormat
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;
Modified: trunk/libavformat/flvenc.c
==============================================================================
--- trunk/libavformat/flvenc.c (original)
+++ trunk/libavformat/flvenc.c Sun Feb 24 01:57:15 2008
@@ -35,8 +35,8 @@ static const AVCodecTag flv_video_codec_
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(AVCodecContex
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;
More information about the ffmpeg-cvslog
mailing list