Mercurial > mplayer.hg

changeset 34908:1b28f529eac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix skip_frame condition, AVDISCARD_DEFAULT is not the same as AVDISCARD_NONE although it behaves the same.
author reimar
date Tue, 12 Jun 2012 17:49:49 +0000
parents e7bfc26b6e42
children 40a9417d9ee8
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Tue Jun 12 07:09:44 2012 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Tue Jun 12 17:49:49 2012 +0000
@@ -884,7 +884,7 @@
 
     if(!got_picture) {
 	if (avctx->codec->id == CODEC_ID_H264 &&
-	    skip_frame == AVDISCARD_NONE)
+	    skip_frame > AVDISCARD_DEFAULT)
 	    return &mpi_no_picture; // H.264 first field only
 	else
 	    return NULL;    // skipped image