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
e08bae6c
Commit
e08bae6c
authored
Mar 01, 2005
by
Eric Petit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg.patch.cvs: workaround buggy lrintf detection when cross compiling
(fixes WMA decoding in BeOS nightly builds)
parent
4e8c1dc2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
9 deletions
+27
-9
extras/contrib/src/Patches/ffmpeg.patch.cvs
extras/contrib/src/Patches/ffmpeg.patch.cvs
+27
-9
No files found.
extras/contrib/src/Patches/ffmpeg.patch.cvs
View file @
e08bae6c
diff -ru ffmpeg-orig/configure ffmpeg/configure
diff -ru ffmpeg-orig/configure ffmpeg/configure
--- ffmpeg-orig/configure 2005-0
1-21 23:16:04
.000000000 +0100
--- ffmpeg-orig/configure 2005-0
2-28 01:05:48
.000000000 +0100
+++ ffmpeg/configure 2005-0
2-18 21:43:55
.000000000 +0100
+++ ffmpeg/configure 2005-0
3-01 21:39:22
.000000000 +0100
@@ -21
0,7 +210
,7 @@
@@ -21
2,7 +212
,7 @@
2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
mmx="no"
mmx="no"
;;
;;
...
@@ -10,7 +10,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -10,7 +10,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
CFLAGS="$CFLAGS -fno-expensive-optimizations"
CFLAGS="$CFLAGS -fno-expensive-optimizations"
;;
;;
esac
esac
@@ -3
74,7 +374
,7 @@
@@ -3
87,7 +387
,7 @@
;;
;;
--extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
--extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
;;
;;
...
@@ -19,7 +19,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -19,7 +19,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
;;
;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;;
;;
@@ -7
09,6 +709
,18 @@
@@ -7
40,6 +740
,18 @@
ranlib="${cross_prefix}${ranlib}"
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
strip="${cross_prefix}${strip}"
...
@@ -38,9 +38,27 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
...
@@ -38,9 +38,27 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
if test -z "$cross_prefix" ; then
if test -z "$cross_prefix" ; then
# ---
# ---
@@ -858,6 +870,9 @@
EOF
have_lrintf="no"
+# BeOS doesn't have lrintf, make sure it is not enabled when
+# cross-compiling
+if test "${cross_prefix}" != "i586-pc-beos-"; then
if $cc $extralibs -o $TMPE $TMPC 2> /dev/null ; then
have_lrintf="yes"
# allanc@chickenandporn.com: cannot execute cross-compiled
@@ -866,6 +881,7 @@
$TMPE 2> /dev/null > /dev/null || have_lrintf="no"
fi
fi
+fi
_restrict=
for restrict_keyword in restrict __restrict__ __restrict; do
diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg-orig/libavcodec/eval.c 2005-01-17 19:25:32.000000000 +0100
--- ffmpeg-orig/libavcodec/eval.c 2005-01-17 19:25:32.000000000 +0100
+++ ffmpeg/libavcodec/eval.c 2005-0
2-18 21:12:57
.000000000 +0100
+++ ffmpeg/libavcodec/eval.c 2005-0
3-01 00:27:04
.000000000 +0100
@@ -34,6 +34,8 @@
@@ -34,6 +34,8 @@
#include <string.h>
#include <string.h>
#include <math.h>
#include <math.h>
...
@@ -51,8 +69,8 @@ diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
...
@@ -51,8 +69,8 @@ diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
#define NAN 0
#define NAN 0
#endif
#endif
diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg-orig/libavformat/tcp.c 200
4-08-12 02:09:32.000000000 +02
00
--- ffmpeg-orig/libavformat/tcp.c 200
5-02-24 20:08:50.000000000 +01
00
+++ ffmpeg/libavformat/tcp.c 2005-0
2-18 21:12:57
.000000000 +0100
+++ ffmpeg/libavformat/tcp.c 2005-0
3-01 00:27:04
.000000000 +0100
@@ -32,6 +32,7 @@
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <netdb.h>
#include <sys/time.h>
#include <sys/time.h>
...
@@ -61,7 +79,7 @@ diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
...
@@ -61,7 +79,7 @@ diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
typedef struct TCPContext {
typedef struct TCPContext {
int fd;
int fd;
@@ -11
3,11 +114
,13 @@
@@ -11
2,11 +113
,13 @@
break;
break;
}
}
...
...
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