[MPlayer-cvslog] r36236 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Sun May  5 09:27:32 2013
New Revision: 36236

Log:
Less strict check for width/height.

Due to cropping AVFrame dimensions can be larger than the display size.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sun May  5 09:27:31 2013	(r36235)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun May  5 09:27:32 2013	(r36236)
@@ -940,8 +940,8 @@ static mp_image_t *decode(sh_video_t *sh
         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;