contrib: gtk: libhb: macosx: test: Remove remaining traces of libavresample.

Extension of and closes #1422.

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index e24a897b9d6d62a7f36bf546c0c9453d60a4990c..9460b5e563895edb8da63ca622d86f5ea4ade238 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -33,7 +33,6 @@ FFMPEG.CONFIGURE.extra = \
     --disable-vaapi \
     --disable-vdpau \
     --disable-encoders \
-    --enable-avresample \
     --enable-libmp3lame \
     --enable-encoder=aac \
     --enable-encoder=ac3 \

diff --git a/gtk/configure.ac b/gtk/configure.ac
index fc2eee0c059dc7c72f40fd59d049e558a2520eae..bd1916a49b8ae8f5a22bedbe7ef1a7b0a3b39a6c 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -179,7 +179,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
 
 GHB_CFLAGS="$HBINC $GHB_CFLAGS"
 
-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lavresample -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
 
 case $host in
   *-*-mingw*)

diff --git a/libhb/hb.c b/libhb/hb.c
index a137e4bbb2f73e956c7cccb40417c40049b17543..77f22925f58a7531deb7b30ef17569ba4d22b945 100644 (file)
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -73,15 +73,6 @@ static void thread_func( void * );
 
 void hb_avcodec_init()
 {
-#ifdef _WIN64
-    // TODO: retest with swresample
-    // avresample's assembly optimizations can cause crashes under Win x86_64
-    // (see http://bugzilla.libav.org/show_bug.cgi?id=496)
-    // disable AVX and FMA4 as a workaround
-    hb_deep_log(2, "hb_avcodec_init: Windows x86_64, disabling AVX and FMA4");
-    int cpu_flags = av_get_cpu_flags() & ~AV_CPU_FLAG_AVX & ~AV_CPU_FLAG_FMA4;
-    av_set_cpu_flags_mask(cpu_flags);
-#endif
 }
 
 int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec,

diff --git a/libhb/module.defs b/libhb/module.defs
index 25f9b170ca0a63fba2f93152c101c9ada44c48cf..3c45869f747633ee1748ab7f29633746c092ee13 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -115,7 +115,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
-        ass avformat avfilter avcodec avutil avresample swresample postproc dvdnav dvdread \
+        ass avformat avfilter avcodec avutil swresample postproc dvdnav dvdread \
         freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \
         x264 xml2 bluray jansson harfbuzz opus speex, \
         $(CONTRIB.build/)lib/lib$(n).a )

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 8faeb4557afd572558e3a0333b180b24addbacb4..85ca6ea03110703ae76455c4109e04267a35d9e1 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -19,7 +19,6 @@
                1C7776A5202301D5001C31EB /* HBRenamePresetController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1C7776A3202301D5001C31EB /* HBRenamePresetController.xib */; };
                1CBC683420BE014800A26CC2 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CBC683320BE014800A26CC2 /* liblzma.a */; };
                1CBC683520BE014800A26CC2 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CBC683320BE014800A26CC2 /* liblzma.a */; };
-               226268E11572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
                22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD2C49177B94DB00EF50D3 /* libvpx.a */; };
                273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; };
                273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; };
@@ -119,7 +118,6 @@
                A91CE2B41C7DABBC0068F46F /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72914B102DA00B785E4 /* libavcodec.a */; };
                A91CE2B51C7DABBC0068F46F /* libavfilter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E165511C523016003EF30E /* libavfilter.a */; };
                A91CE2B61C7DABBC0068F46F /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72A14B102DA00B785E4 /* libavformat.a */; };
-               A91CE2B71C7DABBC0068F46F /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
                A91CE2B81C7DABBC0068F46F /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72B14B102DA00B785E4 /* libavutil.a */; };
                A91CE2B91C7DABBC0068F46F /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; };
                A91CE2BA1C7DABBC0068F46F /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
@@ -326,7 +324,6 @@
                1C7776A0202300DC001C31EB /* HBRenamePresetController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBRenamePresetController.m; sourceTree = "<group>"; };
                1C7776A1202300DC001C31EB /* HBRenamePresetController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBRenamePresetController.h; sourceTree = "<group>"; };
                1CBC683320BE014800A26CC2 /* liblzma.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblzma.a; path = external/contrib/lib/liblzma.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               226268DF1572CC7300477B4E /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = external/contrib/lib/libavresample.a; sourceTree = BUILT_PRODUCTS_DIR; };
                22CC9E74191EBEA500C69D81 /* libx265.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx265.a; path = external/contrib/lib/libx265.a; sourceTree = BUILT_PRODUCTS_DIR; };
                22DD2C49177B94DB00EF50D3 /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = external/contrib/lib/libvpx.a; sourceTree = BUILT_PRODUCTS_DIR; };
                271BA4C014B119F800BC1D2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = external/macosx/Info.plist; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -656,7 +653,6 @@
                                27D6C74414B102DA00B785E4 /* libass.a in Frameworks */,
                                27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */,
                                27D6C74814B102DA00B785E4 /* libavformat.a in Frameworks */,
-                               226268E11572CC7300477B4E /* libavresample.a in Frameworks */,
                                27D6C74A14B102DA00B785E4 /* libavutil.a in Frameworks */,
                                27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */,
                                27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
@@ -716,7 +712,6 @@
                                A91CE2B41C7DABBC0068F46F /* libavcodec.a in Frameworks */,
                                A91CE2B51C7DABBC0068F46F /* libavfilter.a in Frameworks */,
                                A91CE2B61C7DABBC0068F46F /* libavformat.a in Frameworks */,
-                               A91CE2B71C7DABBC0068F46F /* libavresample.a in Frameworks */,
                                A91CE2B81C7DABBC0068F46F /* libavutil.a in Frameworks */,
                                A91CE2B91C7DABBC0068F46F /* libbluray.a in Frameworks */,
                                A91CE2BA1C7DABBC0068F46F /* libdvdnav.a in Frameworks */,
@@ -763,7 +758,6 @@
                                27D6C72814B102DA00B785E4 /* libass.a */,
                                27D6C72914B102DA00B785E4 /* libavcodec.a */,
                                27D6C72A14B102DA00B785E4 /* libavformat.a */,
-                               226268DF1572CC7300477B4E /* libavresample.a */,
                                27D6C72B14B102DA00B785E4 /* libavutil.a */,
                                27D6C72C14B102DA00B785E4 /* libbluray.a */,
                                27D6C72E14B102DA00B785E4 /* libdvdnav.a */,

diff --git a/test/module.defs b/test/module.defs
index c8d230a2775cdbdb2fc542c7460d5cd8623e92f7..2ecbb076787369abe1516e7dd73656be77ce7708 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -14,7 +14,7 @@ TEST.GCC.L = $(CONTRIB.build/)lib
 TEST.libs = $(LIBHB.a)
 
 TEST.GCC.l = \
-        ass avformat avfilter avcodec avutil avresample swresample postproc mp3lame dvdnav \
+        ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
         dvdread fribidi \
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma