[Mplayer-cvslog] CVS: main cfg-common.h,1.11,1.12 cfg-mencoder.h,1.6,1.7 cfg-mplayer.h,1.107,1.108

[Michael Niedermayer]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv11780

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
Log Message:
horizontal up/downscale linear & cubic
-sws command line option (0 -> fast_bilinear, 1->bilinear, 2->bicubic)


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cfg-common.h	1 Dec 2001 23:39:47 -0000	1.11
+++ cfg-common.h	2 Dec 2001 20:03:26 -0000	1.12
@@ -82,6 +82,7 @@
 #else
         {"oldpp", "MPlayer was compiled without opendivx library", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #endif
+	{"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2},
 
 #ifdef USE_TV
 	{"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0},

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfg-mencoder.h	1 Dec 2001 01:29:25 -0000	1.6
+++ cfg-mencoder.h	2 Dec 2001 20:03:26 -0000	1.7
@@ -11,6 +11,8 @@
 extern int use_old_pp;
 #endif
 
+extern int sws_flags;
+
 struct config divx4opts_conf[]={
 	{"br", &divx4_param.bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000},
 	{"rc_period", &divx4_param.rc_period, CONF_TYPE_INT, 0,0,0},

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- cfg-mplayer.h	1 Dec 2001 22:54:17 -0000	1.107
+++ cfg-mplayer.h	2 Dec 2001 20:03:26 -0000	1.108
@@ -74,6 +74,8 @@
 /* from dec_audio, currently used for ac3surround decoder only */
 extern int audio_output_channels;
 
+extern int sws_flags;
+
 /*
  * CONF_TYPE_FUNC_FULL :
  * allows own implemtations for passing the params
@@ -175,7 +177,7 @@
 
 #ifdef HAVE_PNG
 	{"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9},
-#endif	
+#endif
 #ifdef HAVE_SDL
 	{"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver\n",
 	    CONF_TYPE_PRINT, 0, 0, 0},