[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c, 1.114, 1.115 ve_lavc.c, 1.88, 1.89

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/tmp/cvs-serv10171/libmpcodecs

Modified Files:
	vd_ffmpeg.c ve_lavc.c 
Log Message:
vismv, alt, ilme options


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- vd_ffmpeg.c	22 Dec 2003 17:26:19 -0000	1.114
+++ vd_ffmpeg.c	30 Dec 2003 18:24:19 -0000	1.115
@@ -98,6 +98,7 @@
 static int lavc_param_vstats=0;
 static int lavc_param_idct_algo=0;
 static int lavc_param_debug=0;
+static int lavc_param_vismv=0;
 
 m_option_t lavc_decode_opts_conf[]={
 	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
@@ -106,9 +107,8 @@
 	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#if LIBAVCODEC_BUILD >= 4642
 	{"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
-#endif
+	{"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -225,6 +225,9 @@
 #if LIBAVCODEC_BUILD >= 4642
     avctx->debug= lavc_param_debug;
 #endif    
+#if LIBAVCODEC_BUILD >= 4698
+    avctx->debug_mv= lavc_param_vismv;
+#endif    
     mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);
     /* AVRn stores huffman table in AVI header */
     /* Pegasus MJPEG stores it also in AVI header, but it uses the common

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ve_lavc.c	28 Dec 2003 19:36:10 -0000	1.88
+++ ve_lavc.c	30 Dec 2003 18:24:19 -0000	1.89
@@ -142,6 +142,8 @@
 static int lavc_param_sc_threshold= 0;
 static int lavc_param_ss= 0;
 static int lavc_param_top= -1;
+static int lavc_param_alt= 0;
+static int lavc_param_ilme= 0;
 
 
 char *lavc_param_acodec = "mp2";
@@ -269,6 +271,12 @@
 #ifdef CODEC_FLAG_H263P_SLICE_STRUCT
 	{"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT, NULL},
 #endif
+#ifdef CODEC_FLAG_ALT_SCAN
+	{"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN, NULL},
+#endif
+#ifdef CODEC_FLAG_INTERLACED_ME
+	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL},
+#endif
 	{"inter_threshold", &lavc_param_inter_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL},
 	{"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL},
 	{"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
@@ -549,6 +557,8 @@
     lavc_venc_context->flags|= lavc_param_mv0;
     lavc_venc_context->flags|= lavc_param_qp_rd;
     lavc_venc_context->flags|= lavc_param_ss;
+    lavc_venc_context->flags|= lavc_param_alt;
+    lavc_venc_context->flags|= lavc_param_ilme;
     if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;
 
     if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;