virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

remove now useless codec_tag setting code in muxers

Browse Source 
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-21 12:44:58 +00:00
parent 07495657fb
commit bb85077fc9
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/aiff.c
View File

@ -165,7 +165,6 @@ static int aiff_write_header(AVFormatContext *s)
AVExtFloat sample_rate; AVExtFloat sample_rate;
/* First verify if format is ok */ /* First verify if format is ok */
enc->codec_tag = codec_get_tag(codec_aiff_tags, enc->codec_id);
if (!enc->codec_tag) { if (!enc->codec_tag) {
av_free(aiff); av_free(aiff);
return -1; return -1;

4
libavformat/asf-enc.c
View File

@ -458,15 +458,11 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* id */ /* id */
if (enc->codec_type == CODEC_TYPE_AUDIO) { if (enc->codec_type == CODEC_TYPE_AUDIO) {
put_le16(pb, 2); put_le16(pb, 2);
if(!enc->codec_tag)
enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
if(!enc->codec_tag) if(!enc->codec_tag)
return -1; return -1;
put_le16(pb, enc->codec_tag); put_le16(pb, enc->codec_tag);
} else { } else {
put_le16(pb, 4); put_le16(pb, 4);
if(!enc->codec_tag)
enc->codec_tag = codec_get_tag(codec_bmp_tags, enc->codec_id);
if(!enc->codec_tag) if(!enc->codec_tag)
return -1; return -1;
put_le32(pb, enc->codec_tag); put_le32(pb, enc->codec_tag);

2
libavformat/au.c
View File

@ -46,8 +46,6 @@ static const AVCodecTag codec_au_tags[] = {
/* AUDIO_FILE header */ /* AUDIO_FILE header */
static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) static int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
{ {
if(!enc->codec_tag)
enc->codec_tag = codec_get_tag(codec_au_tags, enc->codec_id);
if(!enc->codec_tag) if(!enc->codec_tag)
return -1; return -1;
put_tag(pb, ".snd"); /* magic number */ put_tag(pb, ".snd"); /* magic number */

6
libavformat/flvenc.c
View File

@ -145,7 +145,7 @@ static int flv_write_header(AVFormatContext *s)
} }
flv->hasVideo=1; flv->hasVideo=1;
videocodecid = codec_get_tag(flv_video_codec_ids, enc->codec_id); videocodecid = enc->codec_tag;
if(videocodecid == 0) { if(videocodecid == 0) {
av_log(enc, AV_LOG_ERROR, "video codec not compatible with flv\n"); av_log(enc, AV_LOG_ERROR, "video codec not compatible with flv\n");
return -1; return -1;
@ -155,7 +155,7 @@ static int flv_write_header(AVFormatContext *s)
samplerate = enc->sample_rate; samplerate = enc->sample_rate;
channels = enc->channels; channels = enc->channels;
audiocodecid = codec_get_tag(flv_audio_codec_ids, enc->codec_id); audiocodecid = enc->codec_tag;
samplesize = (enc->codec_id == CODEC_ID_PCM_S8) ? 8 : 16; samplesize = (enc->codec_id == CODEC_ID_PCM_S8) ? 8 : 16;
if(get_audio_flags(enc)<0) if(get_audio_flags(enc)<0)
@ -282,7 +282,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
if (enc->codec_type == CODEC_TYPE_VIDEO) { if (enc->codec_type == CODEC_TYPE_VIDEO) {
put_byte(pb, FLV_TAG_TYPE_VIDEO); put_byte(pb, FLV_TAG_TYPE_VIDEO);
flags = codec_get_tag(flv_video_codec_ids, enc->codec_id); flags = enc->codec_tag;
if(flags == 0) { if(flags == 0) {
av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id);
return -1; return -1;

4
libavformat/riff.c
View File

@ -295,8 +295,6 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
int bps, blkalign, bytespersec; int bps, blkalign, bytespersec;
int hdrsize = 18; int hdrsize = 18;
if(!enc->codec_tag || enc->codec_tag > 0xffff)
enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
if(!enc->codec_tag || enc->codec_tag > 0xffff) if(!enc->codec_tag || enc->codec_tag > 0xffff)
return -1; return -1;
@ -387,7 +385,7 @@ void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *ta
put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */ put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */
/* compression type */ /* compression type */
put_le32(pb, for_asf ? (enc->codec_tag ? enc->codec_tag : av_codec_get_tag(asf_muxer.codec_tag, enc->codec_id)) : enc->codec_tag); // put_le32(pb, enc->codec_tag);
put_le32(pb, enc->width * enc->height * 3); put_le32(pb, enc->width * enc->height * 3);
put_le32(pb, 0); put_le32(pb, 0);
put_le32(pb, 0); put_le32(pb, 0);