Commit 7c994c36 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Carl Eugen Hoyos

Process picture aspect ratio changes in H.264.

This fixes playback of such streams with ffplay (but does not affect
current ffmpeg).

Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl

Originally committed as revision 22112 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5692ed3a
......@@ -1775,7 +1775,9 @@ 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
|| h->sps.sar.num != s->avctx->sample_aspect_ratio.num
|| h->sps.sar.den != s->avctx->sample_aspect_ratio.den)) {
if(h != h0)
return -1; // width / height changed during parallelized decoding
free_tables(h);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment