Mercurial > mplayer.hg

diff libmpcodecs/vd_ffmpeg.c @ 31953:2b390c08ed07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve correct-pts with PAFF streams. Patch by P«”sztor Szil«”rd, bartosteka freemail hu
author cehoyos
date Mon, 30 Aug 2010 23:24:56 +0000
parents 45966266392b
children 7eaaed7331f3
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Mon Aug 30 16:48:52 2010 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Mon Aug 30 23:24:56 2010 +0000
@@ -103,6 +103,11 @@
 static int lavc_param_bitexact=0;
 static char *lavc_avopt = NULL;
 
+static const mp_image_t mpi_no_picture =
+{
+	.type = MP_IMGTYPE_INCOMPLETE
+};
+
 const m_option_t lavc_decode_opts_conf[]={
     {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
     {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
@@ -901,7 +906,12 @@
     }
 //--
 
-    if(!got_picture) return NULL;        // skipped image
+    if(!got_picture) {
+	if (avctx->codec->id == CODEC_ID_H264)
+	    return &mpi_no_picture; // H.264 first field only
+	else
+	    return NULL;    // skipped image
+    }
 
     if(init_vo(sh, avctx->pix_fmt) < 0) return NULL;