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 /contrib/ffmpeg | |
| 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 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index a86671db3..9956083f4 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -47,7 +47,6 @@ FFMPEG.CONFIGURE.extra += \ --enable-encoder=libfdk_aac endif -ifeq (1,$(FEATURE.avformat)) FFMPEG.CONFIGURE.extra += \ --enable-muxer=matroska \ --enable-muxer=webm \ @@ -55,7 +54,6 @@ FFMPEG.CONFIGURE.extra += \ --enable-muxer=mp4 \ --enable-muxer=psp \ --enable-muxer=ipod -endif ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system)) |