# HG changeset patch # User reimar # Date 1367738852 0 # Node ID 1cfb48d5243f4b8b42befa7fb3716d12c454d45e # Parent e9f52175df8639fe8e1f7f797afb066f0c49e697 Less strict check for width/height. Due to cropping AVFrame dimensions can be larger than the display size. diff -r e9f52175df86 -r 1cfb48d5243f libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Sun May 05 07:27:31 2013 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Sun May 05 07:27:32 2013 +0000 @@ -940,8 +940,8 @@ return NULL; } - if (mpi->w != pic->width || mpi->h != pic->height || - pic->width != avctx->width || pic->height != avctx->height) { + if (mpi->w != avctx->width || mpi->h != avctx->height || + pic->width < mpi->w || pic->height < mpi->h) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n", mpi->w, mpi->h, pic->width, pic->height, avctx->width, avctx->height); return NULL;