X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Friffenc.c;h=04a21fcffaabc8c4c680d5caa7840b7858072d81;hb=d63f8c873bd65f4dfab852069fb5faf07cffe6aa;hp=c04d55c4230dcc85889785b023da58fd707e64d3;hpb=1c9ac700dd141e545538a824f5a8cb81bb0a375d;p=ffmpeg

diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index c04d55c4230..04a21fcffaa 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -207,11 +207,12 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb,
 
 /* BITMAPINFOHEADER header */
 void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par,
-                       int for_asf, int ignore_extradata)
+                       int for_asf, int ignore_extradata, int rgb_frame_is_flipped)
 {
-    int keep_height = par->extradata_size >= 9 &&
-                      !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9);
-    int extradata_size = par->extradata_size - 9*keep_height;
+    int flipped_extradata = (par->extradata_size >= 9 &&
+                            !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9));
+    int keep_height = flipped_extradata || rgb_frame_is_flipped;
+    int extradata_size = par->extradata_size - 9*flipped_extradata;
     enum AVPixelFormat pix_fmt = par->format;
     int pal_avi;