lavf/riffenc: Handle AV_PIX_FMT_MONOBLACK

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago · 3ba57bfe8d
parent 6eb4021d47
commit 3ba57bfe8d
1 changed files with 6 additions and 1 deletions
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@ -241,9 +241,14 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
                avio_w8(pb, 0);
        } else if (raw_pal_avi) {
            int i;
+            enum AVPixelFormat pix_fmt = enc->pix_fmt;
+            if (pix_fmt == AV_PIX_FMT_NONE && enc->bits_per_coded_sample == 1)
+                pix_fmt = AV_PIX_FMT_MONOWHITE;
            for (i = 0; i < 1 << enc->bits_per_coded_sample; i++) {
                /* Initialize 1 bpp palette to black & white */
-                if (!i && enc->bits_per_coded_sample == 1)
+                if (i == 0 && pix_fmt == AV_PIX_FMT_MONOWHITE)
+                    avio_wl32(pb, 0xffffff);
+                else if (i == 1 && pix_fmt == AV_PIX_FMT_MONOBLACK)
                    avio_wl32(pb, 0xffffff);
                else
                    avio_wl32(pb, 0);