[Mplayer-cvslog] CVS: main Makefile,1.161,1.162 codec-cfg.c,1.70,1.71 codec-cfg.h,1.43,1.44 configure,1.398,1.399

[Zoltan Ponekker]

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

Modified Files:
	Makefile codec-cfg.c codec-cfg.h configure 
Log Message:
Add IJPG decoder.

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- Makefile	10 Mar 2002 00:15:21 -0000	1.161
+++ Makefile	10 Mar 2002 22:49:10 -0000	1.162
@@ -55,7 +55,7 @@
 VO_LIBS = -Llibvo -lvo
 VO_INC = -Ilibvo
 endif
-V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(JPEG_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
 AO_LIBS = -Llibao2 -lao2
 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- codec-cfg.c	25 Feb 2002 02:48:37 -0000	1.70
+++ codec-cfg.c	10 Mar 2002 22:49:10 -0000	1.71
@@ -252,6 +252,7 @@
 		"roqvideo",
 		"qtrpza",
 		"mpng",
+		"ijpg",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- codec-cfg.h	25 Feb 2002 02:48:37 -0000	1.43
+++ codec-cfg.h	10 Mar 2002 22:49:10 -0000	1.44
@@ -60,6 +60,7 @@
 #define VFM_ROQVIDEO 19
 #define VFM_QTRPZA 20
 #define VFM_MPNG 21
+#define VFM_IJPG 22
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- configure	10 Mar 2002 15:46:40 -0000	1.398
+++ configure	10 Mar 2002 22:49:10 -0000	1.399
@@ -120,6 +120,8 @@
   --enable-termcap       use termcap database for key codes [autodetect]
   --enable-lirc          enable LIRC (remote control) support [autodetect]
   --enable-gui           enable GUI [disable]
+  --enable-png		 enable png support [autodetect]
+  --enable-jpeg		 enable jpeg support [autodetect]
   --disable-tv           disable TV Interface (tv/dvb grabbers) [enable]
   --disable-tv-v4l       disable Video 4 Linux TV Interface support [autodetect]
   --disable-win32        disable Win32 DLL support [autodetect]
@@ -737,6 +739,7 @@
 _sdl=auto
 _nas=auto
 _png=auto
+_jpg=auto
 _gl=auto
 _ggi=auto
 _aa=auto
@@ -816,6 +819,8 @@
   --disable-nas)	_nas=no		;;
   --enable-png)		_png=yes	;;
   --disable-png)	_png=no		;;
+  --enable-jpeg)	_jpg=yes	;;
+  --disable-jpeg)	_jpg=no		;;
   --enable-gl)		_gl=yes		;;
   --disable-gl)		_gl=no		;;
   --enable-ggi)		_ggi=yes	;;
@@ -1978,6 +1983,39 @@
   _mkf_png="no"
 fi
 
+echocheck "JPEG support"
+if test "$_jpg" = auto ; then
+  _jpg=no
+cat > $TMPC << EOF
+#include <stdio.h>
+#include <stdlib.h>
+#include <setjmp.h>
+#include <string.h>
+#include <jpeglib.h>
+int main(void) {
+  return 0;
+}
+EOF
+    if cc_check -ljpeg -lm ; then
+      if "$TMPO" >> "$TMPLOG" ; then
+        _jpg=yes
+        echores yes
+      fi
+    else
+      echores no
+    fi
+else
+  echores "$_jpg"
+fi
+if test "$_jpg" = yes ; then
+  _def_jpg='#define HAVE_JPEG 1'
+  _ld_jpg='-ljpeg'
+  _mkf_jpg="yes"
+else
+  _def_jpg='#undef HAVE_JPEG'
+  _mkf_jpg="no"
+fi
+
 
 if test "$_vesa" != no ; then
 echocheck "VESA support"
@@ -3061,6 +3099,7 @@
 VO2 = $_vo2
 
 PNG = $_mkf_png
+JPEG = $_mkf_jpg
 
 EXTRA_LIB = $_ld_extra
 Z_LIB =  $_ld_static $_ld_zlib
@@ -3076,6 +3115,7 @@
 MLIB_LIB =  $_ld_mlib
 MLIB_INC = $_inc_mlib
 PNG_LIB = $_ld_png
+JPEG_LIB = $_ld_jpg
 SDL_LIB = $_ld_sdl
 SVGA_LIB = $_ld_svga
 AA_LIB = $_ld_aa
@@ -3358,6 +3398,9 @@
 
 /* enable PNG support */
 $_def_png
+
+/* enable JPEG support */
+$_def_jpg
 
 /* libmad support */
 $_def_mad