# HG changeset patch
# User reimar
# Date 1336293868 0
# Node ID e3ceb73d4152603f9f640a7c44372d88e974a716
# Parent  079b53acda6d62e924e0fc5cce91e6704073e459
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.

diff -r 079b53acda6d -r e3ceb73d4152 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Wed May 02 21:15:07 2012 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun May 06 08:44:28 2012 +0000
@@ -867,7 +867,8 @@
 //--
 
     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