diff options
| author | Mats Peterson <matsp888@yahoo.com> | 2016-03-13 08:59:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-13 13:12:13 +0100 |
| commit | ed5d295a6983c162bd136a33a17e40e92dca4284 (patch) | |
| tree | fa14800a3515bf52e08156c190c2dfe112e1a285 /libavformat/riffenc.c | |
| parent | f680c8e41a9bf8963a22386939ea65f060559404 (diff) | |
| download | ffmpeg-ed5d295a6983c162bd136a33a17e40e92dca4284.tar.gz | |
lavf/riffenc: Improve spec compliance; Fix WMP playback of AVI with xxpc chunks
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/riffenc.c')
| -rw-r--r-- | libavformat/riffenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 195a58ea7f..33879ea1ab 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -219,11 +219,8 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, pix_fmt == AV_PIX_FMT_MONOWHITE || pix_fmt == AV_PIX_FMT_MONOBLACK); - if (!enc->extradata_size && pal_avi) - extradata_size = 4 * (1 << enc->bits_per_coded_sample); - - /* size */ - avio_wl32(pb, 40 + (ignore_extradata ? 0 :extradata_size)); + /* Size (not including the size of the color table or color masks) */ + avio_wl32(pb, 40 + (ignore_extradata || pal_avi ? 0 : extradata_size)); avio_wl32(pb, enc->width); //We always store RGB TopDown avio_wl32(pb, enc->codec_tag || keep_height ? enc->height : -enc->height); @@ -236,7 +233,10 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, avio_wl32(pb, (enc->width * enc->height * (enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24)+7) / 8); avio_wl32(pb, 0); avio_wl32(pb, 0); - avio_wl32(pb, 0); + /* Number of color indices in the color table that are used. + * A value of 0 means 2^biBitCount indices, but this doesn't work + * with Windows Media Player and files containing xxpc chunks. */ + avio_wl32(pb, pal_avi ? 1 << enc->bits_per_coded_sample : 0); avio_wl32(pb, 0); if (!ignore_extradata) { |