summaryrefslogtreecommitdiff
path: root/libavformat/avienc.c
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2003-05-07 19:01:45 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2003-05-07 19:01:45 +0000
commit631670888d4ff9ca08c9d0804082511a1bc587a5 (patch)
tree2bf2601c9204d6d3097f93cda618a25eb0d4bb74 /libavformat/avienc.c
parent4e80eb21afd02747592e9fb9cfe2679401b7857e (diff)
* introducing new public interface in imgconvert.c
+ avcodec_get_pix_fmt converts textual representation of pixel format into the actual id. Complements avcodec_get_pix_fmt_name. + avpicture_layout serializes given picture into a flat array. Complements avpicture_fill. * adding a new option -pix_fmt to the ffmpeg, in order to control pixel format for the codecs that do support it, like rawvideo, for example. * reducing complexity of the rawvideo codec by splitting it in two and making it more reliable via hooking up to the avpicture_layout. Plus adding new FourCC as described here: http://www.fourcc.org * A tiny fix for avienc.c that makes avih and video strf consistent regarding codec FourCC. Originally committed as revision 1842 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
-rw-r--r--libavformat/avienc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 72e9825234..b3c7c26aaf 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -211,7 +211,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) : codec_get_tag(tags, enc->codec_id));
+ put_le32(pb, for_asf ? 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);