Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv888 Modified Files: Makefile codec-cfg.c codec-cfg.h Log Message: ima4 added Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- Makefile 23 Oct 2001 12:03:41 -0000 1.82 +++ Makefile 23 Oct 2001 14:01:13 -0000 1.83 @@ -16,7 +16,7 @@ #prefix = /usr/local BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin -SRCS = xacodec.c cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c spudec.c +SRCS = ima4.c xacodec.c cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c spudec.c OBJS = $(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) $(MADLIB_INC) # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- codec-cfg.c 23 Oct 2001 12:03:41 -0000 1.43 +++ codec-cfg.c 23 Oct 2001 14:01:13 -0000 1.44 @@ -210,6 +210,7 @@ "libvorbis", "ffmpeg", "libmad", + "ima4", NULL }; static char *videodrv[] = { Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- codec-cfg.h 23 Oct 2001 12:03:41 -0000 1.21 +++ codec-cfg.h 23 Oct 2001 14:01:13 -0000 1.22 @@ -30,6 +30,7 @@ #define AFM_VORBIS 10 #define AFM_FFMPEG 11 #define AFM_MAD 12 +#define AFM_IMA4 13 #define VFM_MPEG 1 #define VFM_VFW 2