Mercurial > mplayer.hg

changeset 34798:e3ceb73d4152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sun, 06 May 2012 08:44:28 +0000
parents 079b53acda6d
children b1b974133fa1
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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