Browse Source

mjpeg: fix crash with lowres and flipped images

Fixes Ticket1155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 14 years ago
parent
commit
0cd17a6291
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/mjpegdec.c

+ 4
- 0
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");
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++) {
int c = s->comp_index[i];


Loading…
Cancel
Save