Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
fd9eb658
Commit
fd9eb658
authored
Jan 09, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: remove unneeded patch
parent
00d1ebdf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
39 deletions
+0
-39
extras/contrib/src/Patches/x264-svn-win32.patch
extras/contrib/src/Patches/x264-svn-win32.patch
+0
-36
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+0
-3
No files found.
extras/contrib/src/Patches/x264-svn-win32.patch
deleted
100644 → 0
View file @
00d1ebdf
--- configure 2008-04-06 09:07:25.000000000 +0200
+++ configure 2008-04-06 09:10:52.000000000 +0200
@@ -516,6 +516,7 @@
# autodetect options that weren't forced nor disabled
libpthread=""
+extradef=""
if test "$pthread" = "auto" ; then
pthread="no"
case $SYS in
@@ -523,13 +524,13 @@
pthread="yes"
;;
MINGW)
- if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then
+ if cc_check pthread.h -lpthread "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
pthread="yes"
libpthread="-lpthread"
- elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then
+ elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0); pthread_num_processors_np(); " ; then
pthread="yes"
libpthread="-lpthreadGC2"
- elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then
+ elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
pthread="yes"
libpthread="-lpthreadGC2 -lwsock32"
define PTW32_STATIC_LIB
@@ -807,7 +808,7 @@
Description: H.264 (MPEG4 AVC) encoder library
Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
Libs: $pclibs
-Cflags: -I$includedir
+Cflags: -I$includedir $extradef
EOF
filters="crop select_every"
extras/contrib/src/contrib-src.mak
View file @
fd9eb658
...
@@ -1448,9 +1448,6 @@ x264-$(X264_VERSION).tar.gz:
...
@@ -1448,9 +1448,6 @@ x264-$(X264_VERSION).tar.gz:
ifdef
GIT
ifdef
GIT
x264
:
x264
:
$(GIT)
clone git://git.videolan.org/x264.git
$(GIT)
clone git://git.videolan.org/x264.git
ifdef
HAVE_WIN32
(
cd
x264
;
patch
-p0
< ../Patches/x264-svn-win32.patch
)
endif
ifdef
HAVE_WIN64
ifdef
HAVE_WIN64
(
cd
x264
;
patch
-p0
< ../Patches/x264-svn-win64.patch
)
(
cd
x264
;
patch
-p0
< ../Patches/x264-svn-win64.patch
)
endif
endif
...
...
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