[FFmpeg-cvslog] r22125 - trunk/libavcodec/h264.c
aurel
subversion
Mon Mar 1 01:22:43 CET 2010
Author: aurel
Date: Mon Mar 1 01:22:43 2010
New Revision: 22125
Log:
revert r22112 which broke playback of cathedral-beta2-400extra-crop-avc.mp4
Modified:
trunk/libavcodec/h264.c
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c Mon Mar 1 00:54:24 2010 (r22124)
+++ trunk/libavcodec/h264.c Mon Mar 1 01:22:43 2010 (r22125)
@@ -1775,9 +1775,7 @@ static int decode_slice_header(H264Conte
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);
More information about the ffmpeg-cvslog
mailing list