highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()

Browse Source 
Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet 2014-09-23 10:07:10 +02:00 committed by Michael Niedermayer
parent e5b3112996
commit 6843b9dc78
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/riffenc.c
View File

@ -209,11 +209,15 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags)
void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
const AVCodecTag *tags, int for_asf, int ignore_extradata) const AVCodecTag *tags, int for_asf, int ignore_extradata)
{ {
int keep_height = enc->extradata_size >= 9 &&
!memcmp(enc->extradata + enc->extradata_size - 9, "BottomUp", 9);
int extradata_size = enc->extradata_size - 9*keep_height;
/* size */ /* size */
avio_wl32(pb, 40 + (ignore_extradata ? 0 : enc->extradata_size)); avio_wl32(pb, 40 + (ignore_extradata ? 0 :extradata_size));
avio_wl32(pb, enc->width); avio_wl32(pb, enc->width);
//We always store RGB TopDown //We always store RGB TopDown
avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height); avio_wl32(pb, enc->codec_tag || keep_height ? enc->height : -enc->height);
/* planes */ /* planes */
avio_wl16(pb, 1); avio_wl16(pb, 1);
/* depth */ /* depth */
@ -227,9 +231,9 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
avio_wl32(pb, 0); avio_wl32(pb, 0);
if (!ignore_extradata) { if (!ignore_extradata) {
avio_write(pb, enc->extradata, enc->extradata_size); avio_write(pb, enc->extradata, extradata_size);
if (!for_asf && enc->extradata_size & 1) if (!for_asf && extradata_size & 1)
avio_w8(pb, 0); avio_w8(pb, 0);
} }
} }