[Mplayer-cvslog] CVS: main AUTHORS,1.20,1.21 Makefile,1.245,1.246 configure,1.643,1.644

[Arpi of Ize]

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

Modified Files:
	AUTHORS Makefile configure 
Log Message:
libgif/libungif based demuxer support for libmpdemux.
patch by Joey Parrish <joey at nicewarrior.org>


Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AUTHORS	31 Dec 2002 18:03:25 -0000	1.20
+++ AUTHORS	28 Jan 2003 00:12:20 -0000	1.21
@@ -346,9 +346,10 @@
     * skip-deinterlace video filter
     * MUXER layer, and new MPEG-PS muxer
 
-Joey Parrish <joey at yunamusic.com>
+Joey Parrish <joey at nicewarrior.org>
     * various fixes
-    * -vo gif89 author
+    * -vo gif89a author
+    * gif demuxer author
 
 Juergen Hammelmann <juergen.hammelmann at gmx.de>
     * TOOLS/menvcd author

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- Makefile	27 Jan 2003 21:47:04 -0000	1.245
+++ Makefile	28 Jan 2003 00:12:20 -0000	1.246
@@ -33,10 +33,10 @@
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(GIF_LIB) 
+VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -r1.643 -r1.644
--- configure	26 Jan 2003 15:42:11 -0000	1.643
+++ configure	28 Jan 2003 00:12:20 -0000	1.644
@@ -167,7 +167,7 @@
   --disable-sortsub      Disable subtitles sorting [enabled]
 
 Codecs:
-  --enable-gif		 enable gif89a output support [autodetect]
+  --enable-gif		 enable gif support [autodetect]
   --enable-png		 enable png input/output support [autodetect]
   --enable-jpeg		 enable jpeg input/output support [autodetect]
   --enable-liblzo	 enable external liblzo support [autodetect]
@@ -2888,7 +2888,7 @@
 fi
 
 
-echocheck "GIF89a support"
+echocheck "GIF support"
 if test "$_gif" = auto ; then
   _gif=no
 cat > $TMPC << EOF
@@ -2915,9 +2915,10 @@
 if test "$_gif" = yes ; then
   _def_gif='#define HAVE_GIF 1'
   _vosrc="$_vosrc vo_gif89a.c"
+  _codecmodules="gif $_codecmodules"
   _vomodules="gif89a $_vomodules"
   _mkf_gif="yes"
-  _gif="yes (old version, some functions disabled)"
+  _gif="yes (old version, some encoding functions disabled)"
   _def_gif_4='#undef HAVE_GIF_4'
 
   cat > $TMPC << EOF
@@ -2939,6 +2940,7 @@
   _def_gif='#undef HAVE_GIF'
   _def_gif_4='#undef HAVE_GIF_4'
   _novomodules="gif89a $_novomodules"
+  _nocodecmodules="gif $_codecmodules"
   _mkf_gif="no"
 fi
 echores "$_gif"