From bb85077fc97b186c270ba82f820b2ec6928d05c6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 21 Jan 2007 12:44:58 +0000 Subject: remove now useless codec_tag setting code in muxers Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/flvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/flvenc.c') diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e587967595..8fc36b9c96 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -145,7 +145,7 @@ static int flv_write_header(AVFormatContext *s) } flv->hasVideo=1; - videocodecid = codec_get_tag(flv_video_codec_ids, enc->codec_id); + videocodecid = enc->codec_tag; if(videocodecid == 0) { av_log(enc, AV_LOG_ERROR, "video codec not compatible with flv\n"); return -1; @@ -155,7 +155,7 @@ static int flv_write_header(AVFormatContext *s) samplerate = enc->sample_rate; 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; 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) { 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) { av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); return -1; -- cgit v1.2.3