diff options
| author | Tomas Härdin <git@haerdin.se> | 2023-06-08 11:55:28 +0200 |
|---|---|---|
| committer | Tomas Härdin <git@haerdin.se> | 2023-06-20 14:35:35 +0200 |
| commit | 4cc40c050ac671d470deeff6c47671a5dd143221 (patch) | |
| tree | 0781acf6c8305a32f5f51e82f68fcb710d79188f | |
| parent | 2cac3fd744ea7f1a8bd0f507718c3323e75442c6 (diff) | |
| download | ffmpeg-4cc40c050ac671d470deeff6c47671a5dd143221.tar.gz | |
lavc/riffenc: Fix msrle support on Windows 95
| -rw-r--r-- | libavformat/riffenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 179b0f12cb..3325419b94 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -239,14 +239,16 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, /* depth */ avio_wl16(pb, par->bits_per_coded_sample ? par->bits_per_coded_sample : 24); /* compression type */ - avio_wl32(pb, par->codec_tag); + // MSRLE compatibility with Media Player 3.1 and Windows 95 + avio_wl32(pb, par->codec_id == AV_CODEC_ID_MSRLE ? 1 : par->codec_tag); avio_wl32(pb, (par->width * par->height * (par->bits_per_coded_sample ? par->bits_per_coded_sample : 24)+7) / 8); 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 << par->bits_per_coded_sample : 0); + // MSRLE on Windows 95 requires a zero here + avio_wl32(pb, pal_avi && par->codec_id != AV_CODEC_ID_MSRLE ? 1 << par->bits_per_coded_sample : 0); avio_wl32(pb, 0); if (!ignore_extradata) { |