|
|
|
@ -211,7 +211,7 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s) |
|
|
|
|
|
|
|
|
|
int ff_mjpeg_decode_sof(MJpegDecodeContext *s) |
|
|
|
|
{ |
|
|
|
|
int len, nb_components, i, width, height, pix_fmt_id; |
|
|
|
|
int len, nb_components, i, width, height, pix_fmt_id, ret; |
|
|
|
|
|
|
|
|
|
/* XXX: verify len field validity */ |
|
|
|
|
len = get_bits(&s->gb, 16); |
|
|
|
@ -309,7 +309,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) |
|
|
|
|
height *= 2; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
avcodec_set_dimensions(s->avctx, width, height); |
|
|
|
|
ret = ff_set_dimensions(s->avctx, width, height); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
s->first_picture = 0; |
|
|
|
|
} |
|
|
|
|