Commit b6c43967 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib: remove FFmpeg unneeded patch

parent 37203287
--- ffmpeg/compat/w32dlfcn.h.old 2017-06-02 14:35:36.726230731 +0200
+++ ffmpeg/compat/w32dlfcn.h 2017-06-02 15:14:38.472865111 +0200
@@ -71,7 +71,11 @@
#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
# define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
#endif
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32);
+#else
+ return NULL;
+#endif
}
#define dlopen(name, flags) win32_dlopen(name)
#define dlclose FreeLibrary
......@@ -224,9 +224,6 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(FFMPEG_BASENAME)
mkdir -p $@-$(FFMPEG_BASENAME)
tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
endif
$(MOVE)
.ffmpeg: ffmpeg
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment