From bc9973768904049469b1ccb9b1da4ce2c54c8fac Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 1 Mar 2010 00:22:43 +0000 Subject: [PATCH] revert r22112 which broke playback of cathedral-beta2-400extra-crop-avc.mp4 Originally committed as revision 22125 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 034142e234..5185e31ebb 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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);