[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.34,1.35 vd_ffmpeg.c,1.53,1.54

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv19362

Modified Files:
	ve_lavc.c vd_ffmpeg.c 
Log Message:
idct algo selection support


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ve_lavc.c	29 Sep 2002 17:53:14 -0000	1.34
+++ ve_lavc.c	29 Sep 2002 23:21:57 -0000	1.35
@@ -86,6 +86,7 @@
 static float lavc_param_rc_initial_cplx=0;
 static int lavc_param_mpeg_quant=0;
 static int lavc_param_fdct=0;
+static int lavc_param_idct=0;
 #if LIBAVCODEC_BUILD >= 4623
 static float lavc_param_aspect=0.0;
 #endif
@@ -168,6 +169,9 @@
 #if LIBAVCODEC_BUILD >= 4627
 	{"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
+#if LIBAVCODEC_BUILD >= 4629
+        {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
+#endif
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
@@ -269,6 +273,9 @@
 
 #if LIBAVCODEC_BUILD >= 4621
     lavc_venc_context->dct_algo= lavc_param_fdct;
+#endif
+#if LIBAVCODEC_BUILD >= 4629
+    lavc_venc_context->idct_algo= lavc_param_idct;
 #endif
 
 #if LIBAVCODEC_BUILD >= 4625

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vd_ffmpeg.c	26 Sep 2002 23:53:50 -0000	1.53
+++ vd_ffmpeg.c	29 Sep 2002 23:21:57 -0000	1.54
@@ -60,15 +60,19 @@
 static int lavc_param_error_resilience=-1;
 static int lavc_param_gray=0;
 static int lavc_param_vstats=0;
+static int lavc_param_idct_algo=0;
 
 struct config lavc_decode_opts_conf[]={
 #if LIBAVCODEC_BUILD >= 4611
-	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
+	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
 	{"ver", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
 #endif
 #if LIBAVCODEC_BUILD >= 4614
 	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
 #endif
+#if LIBAVCODEC_BUILD >= 4629
+	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
+#endif
 	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
@@ -162,6 +166,9 @@
 #endif
 #if LIBAVCODEC_BUILD >= 4628
     avctx->fourcc= sh->format;
+#endif
+#if LIBAVCODEC_BUILD >= 4629
+    avctx->idct_algo= lavc_param_idct_algo;
 #endif
     
     mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);