MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mjpegdec: handle lowres with AVID cropping

Browse Source
This commit is contained in:
Anton Khirnov 2021-03-01 10:10:54 +01:00
parent e3c4e1f0c4
commit 2f004b357e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mjpegdec.c
View File

@ -445,16 +445,16 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if (ret < 0)
return ret;
if ((s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') ||
s->avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) &&
s->orig_height < height)
s->avctx->height = AV_CEIL_RSHIFT(s->orig_height, s->avctx->lowres);
s->first_picture = 0;
} else {
size_change = 0;
}
if ((s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') ||
s->avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) &&
s->orig_height < s->avctx->height)
s->avctx->height = s->orig_height;
if (s->avctx->codec_id == AV_CODEC_ID_SMVJPEG) {
s->avctx->height = s->avctx->coded_height / s->smv_frames_per_jpeg;
if (s->avctx->height <= 0)
@ -2863,8 +2863,8 @@ the_end:
if ((avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') ||
avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) &&
avctx->coded_height > s->orig_height) {
frame->height = avctx->coded_height;
frame->crop_top = frame->height - s->orig_height;
frame->height = AV_CEIL_RSHIFT(avctx->coded_height, avctx->lowres);
frame->crop_top = frame->height - avctx->height;
}
ret = 0;