Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
31ff21f3
Commit
31ff21f3
authored
Jan 28, 2009
by
Hannes Domani
Committed by
Christophe Mutricy
Feb 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix h264 encoding in windows
Signed-off-by:
Christophe Mutricy
<
xtophe@videolan.org
>
parent
95862a5a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
configure.ac
configure.ac
+6
-0
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-0
extras/contrib/src/Patches/pthreads-detach.patch
extras/contrib/src/Patches/pthreads-detach.patch
+12
-0
No files found.
configure.ac
View file @
31ff21f3
...
@@ -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])
...
...
extras/contrib/src/Makefile
View file @
31ff21f3
...
@@ -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/
)
...
...
extras/contrib/src/Patches/pthreads-detach.patch
0 → 100644
View file @
31ff21f3
--- 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);
/*
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment