virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mjpeg: fix crash with lowres and flipped images

Browse Source 
Fixes Ticket1155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-12 01:29:04 +02:00
parent c0af87550a
commit 0cd17a6291
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegdec.c
View File

@ -974,6 +974,10 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
"Can not flip image with CODEC_FLAG_EMU_EDGE set!\n"); "Can not flip image with CODEC_FLAG_EMU_EDGE set!\n");
s->flipped = 0; s->flipped = 0;
} }
if (s->flipped && s->avctx->lowres) {
av_log(s->avctx, AV_LOG_ERROR, "Can not flip image with lowres\n");
s->flipped = 0;
}
for (i = 0; i < nb_components; i++) { for (i = 0; i < nb_components; i++) {
int c = s->comp_index[i]; int c = s->comp_index[i];