Commit bc997376 authored by Aurelien Jacobs's avatar Aurelien Jacobs

revert r22112 which broke playback of cathedral-beta2-400extra-crop-avc.mp4

Originally committed as revision 22125 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8897b247
......@@ -1775,9 +1775,7 @@ 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
|| h->sps.sar.num != s->avctx->sample_aspect_ratio.num
|| h->sps.sar.den != s->avctx->sample_aspect_ratio.den)) {
&& ( s->width != s->avctx->width || s->height != s->avctx->height)) {
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