diff options
| author | Calcium <calcium@nurs.or.jp> | 2005-03-23 12:42:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-23 12:42:12 +0000 |
| commit | 649b918c9f0ad4699ae756a9deace5806c6d683c (patch) | |
| tree | 8cdb26051cc7863337f3ea356a84429829157610 /libavformat | |
| parent | 58d2a1506d7d777eac7f81f2e1969b12038b6103 (diff) | |
| download | ffmpeg-649b918c9f0ad4699ae756a9deace5806c6d683c.tar.gz | |
29_vtag_in_ASF_not_effective.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4071 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avienc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index daaa151818..72abee37f1 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -246,7 +246,7 @@ void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */ /* compression type */ - put_le32(pb, for_asf ? codec_get_asf_tag(tags, enc->codec_id) : enc->codec_tag); + put_le32(pb, for_asf ? (enc->codec_tag ? enc->codec_tag : codec_get_asf_tag(tags, enc->codec_id)) : enc->codec_tag); // put_le32(pb, enc->width * enc->height * 3); put_le32(pb, 0); put_le32(pb, 0); |