diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 12:44:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 12:44:58 +0000 |
| commit | bb85077fc97b186c270ba82f820b2ec6928d05c6 (patch) | |
| tree | ed1ce352159e32d666357e934193d4e9eab53f2c /libavformat/riff.c | |
| parent | 07495657fb32501c1a8b1361ca5680ded1364cd5 (diff) | |
| download | ffmpeg-bb85077fc97b186c270ba82f820b2ec6928d05c6.tar.gz | |
remove now useless codec_tag setting code in muxers
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 08371a3aeb..7a7f7cd0a6 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -296,8 +296,6 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) 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) return -1; put_le16(pb, enc->codec_tag); @@ -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 */ /* 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, 0); put_le32(pb, 0); |