diff options
| author | jstebbins <[email protected]> | 2014-08-18 17:22:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-08-18 17:22:30 +0000 |
| commit | c548eb0cb8c86031541afaad848023fc8f4ff55a (patch) | |
| tree | 95a2293b59a8289fa179fb19f52699aee024aae1 /gtk | |
| parent | 748126d08ba751d866f2d0140d04d4d08346cdf3 (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 'gtk')
| -rw-r--r-- | gtk/configure.ac | 16 | ||||
| -rw-r--r-- | gtk/module.defs | 8 |
2 files changed, 0 insertions, 24 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index f24323bf1..fac3f167b 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -60,14 +60,6 @@ AC_ARG_ENABLE(fdk-aac, AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]), use_fdk_aac=yes, use_fdk_aac=no) -AC_ARG_ENABLE(mp4v2, - AS_HELP_STRING([--enable-mp4v2], [enable mp4v2 muxer]), - use_mp4v2=yes, use_mp4v2=no) - -AC_ARG_ENABLE(libmkv, - AS_HELP_STRING([--enable-libmkv], [enable libmkv muxer]), - use_libmkv=yes, use_libmkv=no) - AC_ARG_ENABLE(x265, AS_HELP_STRING([--enable-x265], [enable x265 encoder]), use_x265=yes, use_x265=no) @@ -189,14 +181,6 @@ if test "x$use_fdk_aac" = "xyes" ; then HB_LIBS+=" -lfdk-aac" fi -if test "x$use_mp4v2" = "xyes" ; then - HB_LIBS+=" -lmp4v2" -fi - -if test "x$use_libmkv" = "xyes" ; then - HB_LIBS+=" -lmkv" -fi - if test "x$use_x265" = "xyes" ; then HB_LIBS+=" -lx265" fi diff --git a/gtk/module.defs b/gtk/module.defs index c23d74fc9..b203ff74e 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -33,14 +33,6 @@ ifeq (1,$(FEATURE.fdk_aac)) GTK.CONFIGURE.extra += --enable-fdk-aac endif -ifeq (1,$(FEATURE.mp4v2)) - GTK.CONFIGURE.extra += --enable-mp4v2 -endif - -ifeq (1,$(FEATURE.libmkv)) - GTK.CONFIGURE.extra += --enable-libmkv -endif - ifeq (1,$(FEATURE.x265)) GTK.CONFIGURE.extra += --enable-x265 endif |