summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:15:16 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:28:03 +0200
commit6122d83981b85997e1fc1e3962c7aca3c3ab6714 (patch)
tree8628c1312f3b30c9f76649b3b6df00484826a33d /Makefile
parent7cd7416c7316ce28cfa663b1f1d578b9c768a6ba (diff)
downloadmpv-6122d83981b85997e1fc1e3962c7aca3c3ab6714.tar.bz2
mpv-6122d83981b85997e1fc1e3962c7aca3c3ab6714.tar.xz
tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg demuxer (which is still sometimes useful to work around libavformat ogg demuxer problems, though it's itself quite buggy) now cannot be compiled without either external libvorbis or libvorbisidec (tremor).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 0 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index b39f75ac9a..84914abb2c 100644
--- a/Makefile
+++ b/Makefile
@@ -186,21 +186,6 @@ SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \
SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
-SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
- tremor/block.c \
- tremor/codebook.c \
- tremor/floor0.c \
- tremor/floor1.c \
- tremor/framing.c \
- tremor/info.c \
- tremor/mapping0.c \
- tremor/mdct.c \
- tremor/registry.c \
- tremor/res012.c \
- tremor/sharedbook.c \
- tremor/synthesis.c \
- tremor/window.c \
-
SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \
stream/frequencies.c stream/tvi_dummy.c
SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c
@@ -601,7 +586,6 @@ DIRS = . \
stream/librtsp \
stream/realrtsp \
sub \
- tremor \
TOOLS \
MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mplayer.mo)
@@ -693,8 +677,6 @@ mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer
stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS)
-tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW)
-
###### installation / clean / generic rules #######