mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
h264: allow cropping to AVCodecContext.width/height
Override the frame size from the SPS with AVCodecContext values if the latter specify a size smaller by less than one macroblock. This is required for correct cropping of MOV files from Canon cameras. Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
8aa93e9004
commit
30f515091c
@ -2968,6 +2968,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
|
||||
else
|
||||
s->height = 16 * s->mb_height - (2 << s->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> s->chroma_y_shift) - 1);
|
||||
|
||||
if (FFALIGN(s->avctx->width, 16) == s->width &&
|
||||
FFALIGN(s->avctx->height, 16) == s->height) {
|
||||
s->width = s->avctx->width;
|
||||
s->height = s->avctx->height;
|
||||
}
|
||||
|
||||
if (s->context_initialized &&
|
||||
(s->width != s->avctx->width || s->height != s->avctx->height ||
|
||||
av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
|
||||
|
Loading…
Reference in New Issue
Block a user