[Mplayer-cvslog] CVS: main/libmpcodecs Makefile, 1.125, 1.126 ad.c, 1.17, 1.18 ad_flac.c, 1.3, NONE

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv15468/libmpcodecs

Modified Files:
	Makefile ad.c 
Removed Files:
	ad_flac.c 
Log Message:
Removed mpflac as ffflac is way better and ad_flac won't compile with external flac

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- Makefile	29 Mar 2004 04:39:04 -0000	1.125
+++ Makefile	5 Apr 2004 22:47:24 -0000	1.126
@@ -6,7 +6,7 @@
 
 AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
 AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_roqaudio.c ad_ra1428.c
-AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c ad_flac.c
+AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
 AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
 
 VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
@@ -46,9 +46,6 @@
 OBJS2=$(SRCS2:.c=.o)
 
 CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) -D_GNU_SOURCE
-ifneq ($(MPFLAC),none)
-CFLAGS += -I../libmpflac
-endif
 
 .SUFFIXES: .c .o
 

Index: ad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ad.c	4 Oct 2003 22:00:24 -0000	1.17
+++ ad.c	5 Apr 2004 22:47:24 -0000	1.18
@@ -39,7 +39,6 @@
 extern ad_functions_t mpcodecs_ad_libdv;
 extern ad_functions_t mpcodecs_ad_qtaudio;
 extern ad_functions_t mpcodecs_ad_ra1428;
-extern ad_functions_t mpcodecs_ad_flac;
 
 ad_functions_t* mpcodecs_ad_drivers[] =
 {
@@ -88,8 +87,5 @@
   &mpcodecs_ad_libdv,
 #endif
   &mpcodecs_ad_ra1428,
-#ifdef HAVE_FLAC
-  &mpcodecs_ad_flac,
-#endif
   NULL
 };

--- ad_flac.c DELETED ---