diff options
| author | Bradley Sepos <[email protected]> | 2018-08-13 17:27:24 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-08-16 18:26:03 -0400 |
| commit | 4b7a96048aa0ebef75079423b64549b763208f32 (patch) | |
| tree | 5fbf18aca309bd2cc9757867e69d4cfdd40f093b /libhb | |
| parent | 29f1a1ee0f951ee6c9e295500a93b05304c562dd (diff) | |
contrib: gtk: libhb: macosx: test: Remove remaining traces of libavresample.
Extension of and closes #1422.
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/hb.c | 9 | ||||
| -rw-r--r-- | libhb/module.defs | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libhb/hb.c b/libhb/hb.c index a137e4bbb..77f22925f 100644 --- 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 25f9b170c..3c45869f7 100644 --- 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 ) |