[vlc-devel] commit: contrib: add --enable-pthreads/--enable-w32threads to ffmpeg ( Ilkka Ollakka )

git version control git at videolan.org
Sun Dec 6 20:31:58 CET 2009


vlc | branch: 1.0-bugfix | Ilkka Ollakka <ileoo at iki.fi> | Sun Nov  8 15:37:16 2009 +0200| [fbd07acc6e6ddb20c234c6c6c5521001785cce2a] | committer: Ilkka Ollakka 

contrib: add --enable-pthreads/--enable-w32threads to ffmpeg

Should work in linux, no idea on win32 builds, so you're free to reverts
if it kills your kittens.

cherry-picked from 4863c909f98a10736b994ca6c06d749e3cbeda44

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fbd07acc6e6ddb20c234c6c6c5521001785cce2a
---

 extras/contrib/src/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b2f63d1..5e8253e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1122,7 +1122,9 @@ FFMPEGCONF += \
 	--disable-protocols \
 	--disable-network
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --enable-w32threads
+else
+FFMPEGCONFG += --enable-pthreads
 endif
 
 ifdef HAVE_WINCE




More information about the vlc-devel mailing list