virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/riffenc: correct calculation for extradata size

Browse Source 
In 1ec2b3de5a, the extradata size was affected when the raster was
signaled as flipped due to user-set option rather than via extradata.
This resulted in a wrong header size being written. Fixed.
This commit is contained in:
Gyan Doshi
2020-07-25 10:39:32 +05:30
parent 7c8ad72f1c
commit 93694fe777
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/riffenc.c
View File

@@ -209,10 +209,10 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb,
void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par,
int for_asf, int ignore_extradata, int rgb_frame_is_flipped) int for_asf, int ignore_extradata, int rgb_frame_is_flipped)
{ {
int keep_height = (par->extradata_size >= 9 && int flipped_extradata = (par->extradata_size >= 9 &&
!memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9)) || !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9));
rgb_frame_is_flipped; int keep_height = flipped_extradata || rgb_frame_is_flipped;
int extradata_size = par->extradata_size - 9*keep_height; int extradata_size = par->extradata_size - 9*flipped_extradata;
enum AVPixelFormat pix_fmt = par->format; enum AVPixelFormat pix_fmt = par->format;
int pal_avi; int pal_avi;