[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.49,1.50

[Michael Niedermayer CVS]

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

Modified Files:
	ve_lavc.c 
Log Message:
trellis quantization


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ve_lavc.c	28 Dec 2002 00:04:20 -0000	1.49
+++ ve_lavc.c	31 Dec 2002 17:29:53 -0000	1.50
@@ -112,6 +112,7 @@
 static int lavc_param_mb_cmp= 0;
 static int lavc_param_dia_size= 0;
 static int lavc_param_qpel= 0;
+static int lavc_param_trell= 0;
 
 #include "cfgparser.h"
 
@@ -178,8 +179,11 @@
         {"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
         {"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
         {"mbcmp", &lavc_param_mb_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
-        {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+        {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
 	{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL},
+#if LIBAVCODEC_BUILD >= 4648
+	{"trell", &lavc_param_trell, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT, NULL},
+#endif
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
@@ -333,7 +337,9 @@
     lavc_venc_context->dia_size= lavc_param_dia_size;
     lavc_venc_context->flags|= lavc_param_qpel;
 #endif 
-        
+#if LIBAVCODEC_BUILD >= 4648
+    lavc_venc_context->flags|= lavc_param_trell;
+#endif 
     lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
     lavc_venc_context->flags|= lavc_param_data_partitioning;
     if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;