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
cfac4eb5
Commit
cfac4eb5
authored
Sep 02, 2005
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* extras/contrib: Fixed theora and x264-svn compilation.
parent
09ed6d81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+2
-2
extras/contrib/src/Patches/x264_svn.patch
extras/contrib/src/Patches/x264_svn.patch
+15
-13
No files found.
extras/contrib/src/Makefile
View file @
cfac4eb5
...
...
@@ -552,7 +552,7 @@ libshout-$(SHOUT_VERSION).tar.gz:
libshout
:
libshout-$(SHOUT_VERSION).tar.gz
$(EXTRACT_GZ)
.shout
:
libshout
.shout
:
libshout
.theora .ogg
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
&&
make
&&
make
install
)
$(INSTALL_NAME)
touch
$@
...
...
@@ -951,7 +951,7 @@ DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
ifdef
SVN
x264
:
$(SVN)
co svn://svn.videolan.org/x264/trunk/ x264
patch
-p
0 <
Patches/x264_svn.patch
cd
x264
&&
patch
-p
0 < ../
Patches/x264_svn.patch
rm
x264/x264.c
else
x264-$(X264_VERSION).tar.gz
:
...
...
extras/contrib/src/Patches/x264_svn.patch
View file @
cfac4eb5
--- x264.orig/encoder/ratecontrol.c 2005-08-24 21:46:21.000000000 +0200
+++ x264/encoder/ratecontrol.c 2005-08-24 21:45:53.000000000 +0200
@@ -37,7 +37,7 @@
#include "common/macroblock.h"
#include "ratecontrol.h"
-#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
+#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_MACOSX)
Index: encoder/ratecontrol.c
===================================================================
--- encoder/ratecontrol.c (revision 291)
+++ encoder/ratecontrol.c (working copy)
@@ -40,7 +40,7 @@
#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
#define exp2f(x) powf( 2, (x) )
#endif
#if defined(_MSC_VER) || defined(SYS_SunOS)
--- x264.orig/Makefile 2005-08-24 21:44:32.000000000 +0200
+++ x264/Makefile 2005-08-24 21:44:11.000000000 +0200
-#if defined(_MSC_VER) || defined(SYS_SunOS)
+#if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
#define exp2f(x) pow( 2, (x) )
#define sqrtf sqrt
#endif
Index: Makefile
===================================================================
--- Makefile (revision 291)
+++ Makefile (working copy)
@@ -53,7 +53,7 @@
OBJS = $(SRCS:%.c=%.o)
DEP = depend
...
...
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