Skip to content

V
vlc-2-2
Commit c51906de authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: fix vpx threading on Win32

parent e4ef96c2
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
contrib/src/vpx/libvpx-win32.patch 0 → 100644
View file @ c51906de
--- libvpx/vp8/common/generic/systemdependent.c 2013-03-14 15:39:20.284261976 +0100
+++ libvpx.new/vp8/common/generic/systemdependent.c 2013-03-14 15:39:01.423974364 +0100
@@ -87,7 +87,7 @@
#endif
-#if HAVE_PTHREAD_H
+#if HAVE_PTHREAD_H && !defined(_WIN32)
#include <pthread.h>
static void once(void (*func)(void))
{
contrib/src/vpx/rules.mak
View file @ c51906de
...@@ -17,6 +17,9 @@ ifdef HAVE_MACOSX ...@@ -17,6 +17,9 @@ ifdef HAVE_MACOSX
$(APPLY) $(SRC)/vpx/libvpx-mac.patch $(APPLY) $(SRC)/vpx/libvpx-mac.patch
$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch $(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
endif endif
ifdef HAVE_WIN32
$(APPLY) $(SRC)/vpx/libvpx-win32.patch
endif
ifneq ($(which bash),/bin/bash) ifneq ($(which bash),/bin/bash)
sed -i.orig \ sed -i.orig \
s,^\#!/bin/bash,\#!`which bash`,g \ s,^\#!/bin/bash,\#!`which bash`,g \
......
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