[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.144,1.145 configure,1.425,1.426

[Zoltan Ponekker]

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

Modified Files:
	cfg-mplayer.h configure 
Log Message:
add jpeg support for libvo

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- cfg-mplayer.h	15 Apr 2002 00:36:21 -0000	1.144
+++ cfg-mplayer.h	16 Apr 2002 11:21:59 -0000	1.145
@@ -21,6 +21,14 @@
 #ifdef HAVE_PNG
 extern int z_compression;
 #endif
+#ifdef HAVE_JPEG
+extern int jpeg_baseline;
+extern int jpeg_progressive_mode;
+extern int jpeg_optimize;
+extern int jpeg_smooth;
+extern int jpeg_quality;
+extern char * jpeg_outdir;
+#endif
 #ifdef HAVE_SDL
 //extern char *sdl_driver;
 extern int sdl_noxv;
@@ -115,6 +123,20 @@
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
+#ifdef HAVE_JPEG
+struct config jpeg_conf[]={
+	{"progressiv", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noprogressiv", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"baseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"nobaseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"optimize", &jpeg_optimize, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"smooth", &jpeg_smooth, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"quality", &jpeg_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"outdir", &jpeg_outdir, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{NULL, NULL, 0, 0, 0, 0, NULL}
+};
+#endif
+
 extern int sws_flags;
 extern int readPPOpt(void *conf, char *arg);
 extern int readNPPOpt(void *conf, char *arg);
@@ -224,6 +246,9 @@
 
 #ifdef HAVE_PNG
 	{"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
+#endif
+#ifdef HAVE_JPEG
+	{"jpeg", jpeg_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
 #endif
 #ifdef HAVE_SDL
 	{"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver\n",

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- configure	15 Apr 2002 17:08:02 -0000	1.425
+++ configure	16 Apr 2002 11:21:59 -0000	1.426
@@ -2153,10 +2153,13 @@
 
 if test "$_jpg" = yes ; then
   _def_jpg='#define HAVE_JPEG 1'
+  _vosrc="$_vosrc vo_jpeg.c"
+  _vomodules="jpeg $_vomodules"
   _ld_jpg="-ljpeg"
   _mkf_jpg="yes"
 else
   _def_jpg='#undef HAVE_JPEG'
+  _novomodules="jpeg $_novomodules"
   _mkf_jpg="no"
 fi