Commit e08bae6c authored by Eric Petit's avatar Eric Petit

ffmpeg.patch.cvs: workaround buggy lrintf detection when cross compiling

  (fixes WMA decoding in BeOS nightly builds)
parent 4e8c1dc2
diff -ru ffmpeg-orig/configure ffmpeg/configure
--- ffmpeg-orig/configure 2005-01-21 23:16:04.000000000 +0100
+++ ffmpeg/configure 2005-02-18 21:43:55.000000000 +0100
@@ -210,7 +210,7 @@
--- ffmpeg-orig/configure 2005-02-28 01:05:48.000000000 +0100
+++ ffmpeg/configure 2005-03-01 21:39:22.000000000 +0100
@@ -212,7 +212,7 @@
2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
mmx="no"
;;
......@@ -10,7 +10,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
CFLAGS="$CFLAGS -fno-expensive-optimizations"
;;
esac
@@ -374,7 +374,7 @@
@@ -387,7 +387,7 @@
;;
--extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
;;
......@@ -19,7 +19,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;;
@@ -709,6 +709,18 @@
@@ -740,6 +740,18 @@
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
......@@ -38,9 +38,27 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
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
--- ffmpeg-orig/libavcodec/eval.c 2005-01-17 19:25:32.000000000 +0100
+++ ffmpeg/libavcodec/eval.c 2005-02-18 21:12:57.000000000 +0100
+++ ffmpeg/libavcodec/eval.c 2005-03-01 00:27:04.000000000 +0100
@@ -34,6 +34,8 @@
#include <string.h>
#include <math.h>
......@@ -51,8 +69,8 @@ diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
#define NAN 0
#endif
diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg-orig/libavformat/tcp.c 2004-08-12 02:09:32.000000000 +0200
+++ ffmpeg/libavformat/tcp.c 2005-02-18 21:12:57.000000000 +0100
--- ffmpeg-orig/libavformat/tcp.c 2005-02-24 20:08:50.000000000 +0100
+++ ffmpeg/libavformat/tcp.c 2005-03-01 00:27:04.000000000 +0100
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <sys/time.h>
......@@ -61,7 +79,7 @@ diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
typedef struct TCPContext {
int fd;
@@ -113,11 +114,13 @@
@@ -112,11 +113,13 @@
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment