diff options
| author | jstebbins <[email protected]> | 2014-01-13 18:43:07 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-01-13 18:43:07 +0000 |
| commit | 1d137b47c62a47a4a08f13fc2bd8207633464fd5 (patch) | |
| tree | bb7c5c62e67d079a4c66220f25a0c6df3e2438af /make | |
| parent | cd00b6f50ede70a9edef1785dd8c74e1d3ab4dad (diff) | |
remove contrib mpeg2dec
We no longer need mpeg2dec. libav now has all the features we need
for mpeg2 decoding.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5966 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 3 | ||||
| -rw-r--r-- | make/include/main.defs | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/make/configure.py b/make/configure.py index 1b71619c8..7cf99ca2e 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1173,8 +1173,6 @@ def createCLI(): grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h ) h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--disable-gst', default=False, action='store_true', help=h ) - h = IfHost( 'enable use of ffmpeg mpeg2 decoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-ff-mpeg2', default=False, action='store_true', help=h ) h = IfHost( 'enable use of Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-qsv', default=False, action='store_true', help=h ) @@ -1643,7 +1641,6 @@ int main () doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) doc.add( 'FEATURE.gst', int( not options.disable_gst )) - doc.add( 'FEATURE.ff.mpeg2', int( options.enable_ff_mpeg2 )) doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) doc.add( 'FEATURE.libav_aac', int( options.enable_libav_aac )) doc.add( 'FEATURE.faac', int( options.enable_faac )) diff --git a/make/include/main.defs b/make/include/main.defs index bf6c5f4ec..dde127c9a 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -60,7 +60,6 @@ MODULES += contrib/ffmpeg MODULES += contrib/libdvdread MODULES += contrib/libdvdnav MODULES += contrib/libbluray -MODULES += contrib/mpeg2dec ifneq (,$(filter $(BUILD.system),mingw)) ifneq ($(HAS.pthread),1) |