Commit 1292fe7b authored by cehoyos's avatar cehoyos

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 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22112 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 35b04ac6
...@@ -1775,7 +1775,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -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); s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3);
if (s->context_initialized 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) if(h != h0)
return -1; // width / height changed during parallelized decoding return -1; // width / height changed during parallelized decoding
free_tables(h); 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