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

[reimar]

Author: reimar
Date: Sun May  6 10:44:28 2012
New Revision: 34886

Log:
Fix A-V desync with skipframe and H.264.

This will however cause desync when skipframe
is used on PAFF H.264 content without correct-pts.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Wed May  2 23:15:07 2012	(r34885)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun May  6 10:44:28 2012	(r34886)
@@ -867,7 +867,8 @@ static mp_image_t *decode(sh_video_t *sh
 //--
 
     if(!got_picture) {
-	if (avctx->codec->id == CODEC_ID_H264)
+	if (avctx->codec->id == CODEC_ID_H264 &&
+	    skip_frame == AVDISCARD_NONE)
 	    return &mpi_no_picture; // H.264 first field only
 	else
 	    return NULL;    // skipped image