diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-01 00:22:43 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-01 00:22:43 +0000 |
| commit | bc9973768904049469b1ccb9b1da4ce2c54c8fac (patch) | |
| tree | 28f70123e7428129a908a1f2cb2c6d020d890ef4 | |
| parent | 8897b247a5be8533529f75e082fd53cca22ac201 (diff) | |
| download | ffmpeg-bc9973768904049469b1ccb9b1da4ce2c54c8fac.tar.gz | |
revert r22112 which broke playback of cathedral-beta2-400extra-crop-avc.mp4
Originally committed as revision 22125 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 1 insertions, 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); |