Mercurial > mplayer.hg

changeset 36142:1cfb48d5243f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Less strict check for width/height. Due to cropping AVFrame dimensions can be larger than the display size.
author reimar
date Sun, 05 May 2013 07:27:32 +0000
parents e9f52175df86
children 3c1595fcf004
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;