Skip to content

F
ffmpeg
Commit 1ba32a3c authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavd/dshow: Interpret negative height as bottom-down frame. 

Fixes ticket #7436.
parent 26902f2e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
libavdevice/dshow.c
View file @ 1ba32a3c
...@@ -996,6 +996,9 @@ dshow_add_device(AVFormatContext *avctx, ...@@ -996,6 +996,9 @@ dshow_add_device(AVFormatContext *avctx,
par->codec_id = AV_CODEC_ID_RAWVIDEO; par->codec_id = AV_CODEC_ID_RAWVIDEO;
if (bih->biCompression == BI_RGB || bih->biCompression == BI_BITFIELDS) { if (bih->biCompression == BI_RGB || bih->biCompression == BI_BITFIELDS) {
par->bits_per_coded_sample = bih->biBitCount; par->bits_per_coded_sample = bih->biBitCount;
if (par->height < 0) {
par->height *= -1;
} else {
par->extradata = av_malloc(9 + AV_INPUT_BUFFER_PADDING_SIZE); par->extradata = av_malloc(9 + AV_INPUT_BUFFER_PADDING_SIZE);
if (par->extradata) { if (par->extradata) {
par->extradata_size = 9; par->extradata_size = 9;
...@@ -1003,6 +1006,7 @@ dshow_add_device(AVFormatContext *avctx, ...@@ -1003,6 +1006,7 @@ dshow_add_device(AVFormatContext *avctx,
} }
} }
} }
}
} else { } else {
WAVEFORMATEX *fx = NULL; WAVEFORMATEX *fx = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment