Commit 31ff21f3 authored by Hannes Domani's avatar Hannes Domani Committed by Christophe Mutricy

fix h264 encoding in windows

Signed-off-by: default avatarChristophe Mutricy <xtophe@videolan.org>
parent 95862a5a
...@@ -3716,6 +3716,9 @@ if test "${enable_x264}" != "no"; then ...@@ -3716,6 +3716,9 @@ if test "${enable_x264}" != "no"; then
VLC_ADD_PLUGIN([x264]) VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then
VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB])
fi
],[ ],[
AC_MSG_ERROR([the specified tree hasn't been compiled]) AC_MSG_ERROR([the specified tree hasn't been compiled])
]) ])
...@@ -3729,6 +3732,9 @@ if test "${enable_x264}" != "no"; then ...@@ -3729,6 +3732,9 @@ if test "${enable_x264}" != "no"; then
VLC_ADD_PLUGIN([x264]) VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then
VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB])
fi
],[ ],[
if test "${enable_x264}" = "yes"; then if test "${enable_x264}" = "yes"; then
AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html]) AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
......
...@@ -2394,6 +2394,7 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz: ...@@ -2394,6 +2394,7 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
(cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
.pthreads: pthreads .pthreads: pthreads
(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.{a,dll} $(PREFIX)/lib/) (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.{a,dll} $(PREFIX)/lib/)
......
--- ptw32_processTerminate.c Mon Jan 26 18:00:34 2009
+++ ptw32_processTerminate.c Mon Jan 26 18:00:42 2009
@@ -96,6 +96,9 @@
tp = tpNext;
}
+ ptw32_threadReuseTop = PTW32_THREAD_REUSE_EMPTY;
+ ptw32_threadReuseBottom = PTW32_THREAD_REUSE_EMPTY;
+
LeaveCriticalSection (&ptw32_thread_reuse_lock);
/*
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