Mercurial > mplayer.hg

comparison Makefile @ 32654:85f0d7406e07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove forked internal libfaad2 copy. The FFmpeg AAC decoder is default now and surpasses libfaad2 in all regards, so there is no longer a reason to keep a forked library copy.
author diego
date Sat, 01 Jan 2011 14:27:41 +0000
parents 139876e79725
children 880e112a9a71
comparison
equal deleted inserted replaced
32653:5f92bf78a2c2 32654:85f0d7406e07
56 libdvdread4/md5.c \ 56 libdvdread4/md5.c \
57 libdvdread4/nav_print.c \ 57 libdvdread4/nav_print.c \
58 libdvdread4/nav_read.c \ 58 libdvdread4/nav_read.c \
59 59
60 SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c 60 SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
61 SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
62 libfaad2/cfft.c \
63 libfaad2/common.c \
64 libfaad2/decoder.c \
65 libfaad2/drc.c \
66 libfaad2/drm_dec.c \
67 libfaad2/error.c \
68 libfaad2/filtbank.c \
69 libfaad2/hcr.c \
70 libfaad2/huffman.c \
71 libfaad2/ic_predict.c \
72 libfaad2/is.c \
73 libfaad2/lt_predict.c \
74 libfaad2/mdct.c \
75 libfaad2/mp4.c \
76 libfaad2/ms.c \
77 libfaad2/output.c \
78 libfaad2/pns.c \
79 libfaad2/ps_dec.c \
80 libfaad2/ps_syntax.c \
81 libfaad2/pulse.c \
82 libfaad2/rvlc.c \
83 libfaad2/sbr_dct.c \
84 libfaad2/sbr_dec.c \
85 libfaad2/sbr_e_nf.c \
86 libfaad2/sbr_fbt.c \
87 libfaad2/sbr_hfadj.c \
88 libfaad2/sbr_hfgen.c \
89 libfaad2/sbr_huff.c \
90 libfaad2/sbr_qmf.c \
91 libfaad2/sbr_syntax.c \
92 libfaad2/sbr_tf_grid.c \
93 libfaad2/specrec.c \
94 libfaad2/ssr.c \
95 libfaad2/ssr_fb.c \
96 libfaad2/ssr_ipqf.c \
97 libfaad2/syntax.c \
98 libfaad2/tns.c \
99
100 SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c 61 SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
101 SRCS_COMMON-$(FFMPEG) += av_opts.c \ 62 SRCS_COMMON-$(FFMPEG) += av_opts.c \
102 libaf/af_lavcresample.c \ 63 libaf/af_lavcresample.c \
103 libmpcodecs/ad_ffmpeg.c \ 64 libmpcodecs/ad_ffmpeg.c \
104 libmpcodecs/vd_ffmpeg.c \ 65 libmpcodecs/vd_ffmpeg.c \
783 libass \ 744 libass \
784 libdvdcss \ 745 libdvdcss \
785 libdvdnav \ 746 libdvdnav \
786 libdvdnav/vm \ 747 libdvdnav/vm \
787 libdvdread4 \ 748 libdvdread4 \
788 libfaad2 \
789 libmenu \ 749 libmenu \
790 libmpcodecs \ 750 libmpcodecs \
791 libmpcodecs/native \ 751 libmpcodecs/native \
792 libmpdemux \ 752 libmpdemux \
793 libmpeg2 \ 753 libmpeg2 \
899 gui/%: CFLAGS += -Wno-strict-prototypes 859 gui/%: CFLAGS += -Wno-strict-prototypes
900 860
901 libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) 861 libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
902 libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) 862 libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
903 libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) 863 libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
904 libfaad2/%: CFLAGS := -Ilibfaad2 -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
905 864
906 loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) 865 loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
907 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT 866 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
908 loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) 867 loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
909 868