summaryrefslogtreecommitdiffstats
path: root/libhb/module.defs
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-08-18 17:22:30 +0000
committerjstebbins <[email protected]>2014-08-18 17:22:30 +0000
commitc548eb0cb8c86031541afaad848023fc8f4ff55a (patch)
tree95a2293b59a8289fa179fb19f52699aee024aae1 /libhb/module.defs
parent748126d08ba751d866f2d0140d04d4d08346cdf3 (diff)
build: remove mp4v2 and libmkv dependencies
...and enable x265 by default git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6309 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/module.defs')
-rw-r--r--libhb/module.defs21
1 files changed, 2 insertions, 19 deletions
diff --git a/libhb/module.defs b/libhb/module.defs
index d0a2da131..b1920fdbd 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,6 +1,6 @@
__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
- LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
- MP4V2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX
+ LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
+ PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
@@ -42,15 +42,6 @@ endif
ifeq (1,$(FEATURE.libav_aac))
LIBHB.GCC.D += USE_LIBAV_AAC
endif
-ifeq (1,$(FEATURE.mp4v2))
-LIBHB.GCC.D += USE_MP4V2
-endif
-ifeq (1,$(FEATURE.libmkv))
-LIBHB.GCC.D += USE_LIBMKV
-endif
-ifeq (1,$(FEATURE.avformat))
-LIBHB.GCC.D += USE_AVFORMAT
-endif
LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
@@ -131,14 +122,6 @@ ifeq (1,$(FEATURE.x265))
LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a
endif
-ifeq (1,$(FEATURE.mp4v2))
-LIBHB.dll.libs += $(CONTRIB.build/)lib/libmp4v2.a
-endif
-
-ifeq (1,$(FEATURE.libmkv))
-LIBHB.dll.libs += $(CONTRIB.build/)lib/libmkv.a
-endif
-
ifneq ($(HAS.iconv),1)
LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
else