Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
b32e2119
Commit
b32e2119
authored
Oct 23, 2005
by
Eric Petit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg.patch.cvs: oops, fix build
parent
dc32e3f7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
extras/contrib/src/Patches/ffmpeg.patch.cvs
extras/contrib/src/Patches/ffmpeg.patch.cvs
+11
-3
No files found.
extras/contrib/src/Patches/ffmpeg.patch.cvs
View file @
b32e2119
...
@@ -19,7 +19,15 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -19,7 +19,15 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
;;
;;
--build-suffix=*) BUILDSUF=${opt#--build-suffix=}
--build-suffix=*) BUILDSUF=${opt#--build-suffix=}
;;
;;
@@ -867,6 +867,18 @@
@@ -473,7 +473,6 @@
--disable-audio-oss) audio_oss="no"
;;
--disable-audio-beos) audio_beos="no"
- extralibs="$extralibs -lbe -lmedia"
;;
--disable-dv1394) dv1394="no"
;;
@@ -867,6 +866,18 @@
ranlib="${cross_prefix}${ranlib}"
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
strip="${cross_prefix}${strip}"
...
@@ -38,7 +46,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -38,7 +46,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
if test -z "$cross_prefix" ; then
if test -z "$cross_prefix" ; then
# ---
# ---
@@ -985,6 +99
7
,7 @@
@@ -985,6 +99
6
,7 @@
EOF
EOF
have_lrintf="no"
have_lrintf="no"
...
@@ -46,7 +54,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -46,7 +54,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
have_lrintf="yes"
have_lrintf="yes"
# allanc@chickenandporn.com: cannot execute cross-compiled
# allanc@chickenandporn.com: cannot execute cross-compiled
@@ -993,6 +100
6
,7 @@
@@ -993,6 +100
5
,7 @@
$TMPE 2> /dev/null > /dev/null || have_lrintf="no"
$TMPE 2> /dev/null > /dev/null || have_lrintf="no"
fi
fi
fi
fi
...
...
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