From 5388f0b479c56179d566c49afd8765fefef4a18e Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Thu, 18 Mar 2010 23:36:54 +0000 Subject: [PATCH] Reinitialize the h264 decoder context on every valid aspect ratio change, not only size changes. Patch by Janusz Krzysztofik foo=zyszt . Originally committed as revision 22597 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9fe7c22208..4cd2933933 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1774,7 +1774,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3); if (s->context_initialized - && ( s->width != s->avctx->width || s->height != s->avctx->height)) { + && ( s->width != s->avctx->width || s->height != s->avctx->height + || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { if(h != h0) return -1; // width / height changed during parallelized decoding free_tables(h);