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

[reimar]

Author: reimar
Date: Tue Jun 12 19:49:49 2012
New Revision: 35002

Log:
Fix skip_frame condition, AVDISCARD_DEFAULT is not the same
as AVDISCARD_NONE although it behaves the same.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Tue Jun 12 09:09:44 2012	(r35001)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Tue Jun 12 19:49:49 2012	(r35002)
@@ -884,7 +884,7 @@ static mp_image_t *decode(sh_video_t *sh
 
     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