* modules/stream_out/transcode.c: fixed small memleak.

[vlc] / extras / contrib / src / Patches / ffmpeg.patch.cvs

diff --git a/extras/contrib/src/Patches/ffmpeg.patch.cvs b/extras/contrib/src/Patches/ffmpeg.patch.cvs
index fdaad918e0542821b785d01c5211471f4bb6b600..2b792cba63032081fc26ded131bee1c8a2db078e 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg.patch.cvs
+++ b/extras/contrib/src/Patches/ffmpeg.patch.cvs
@@ -1,6 +1,70 @@
-diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
---- ffmpeg.old/libavcodec/eval.c       Thu Mar  6 12:32:01 2003
-+++ ffmpeg/libavcodec/eval.c   Sun Nov  2 02:04:09 2003
+diff -ru ffmpeg-orig/configure ffmpeg/configure
+--- ffmpeg-orig/configure      2005-10-23 16:00:23.000000000 +0200
++++ ffmpeg/configure   2005-10-23 16:05:03.000000000 +0200
+@@ -254,7 +254,7 @@
+ 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
+ mmx="no"
+ ;;
+-*20010315*) echo "BeBits gcc"
++*20010315*|2.95.3*) echo "BeBits gcc"
+ CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ ;;
+ esac
+@@ -448,7 +448,7 @@
+   ;;
+   --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+   ;;
+-  --extra-libs=*) extralibs=${opt#--extra-libs=}
++  --extra-libs=*) extralibs="$extralibs ${opt#--extra-libs=}"
+   ;;
+   --build-suffix=*) BUILDSUF=${opt#--build-suffix=}
+   ;;
+@@ -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}"
+ strip="${cross_prefix}${strip}"
+ 
++if test "${cross_prefix}" = "i586-pc-beos-"; then
++  # Cross-compiling from Linux for BeOS
++  CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer -fno-expensive-optimizations"
++  SHFLAGS=-nostart
++  audio_oss="no"
++  v4l="no"
++  dv1394="no"
++  netserver="yes"
++  need_inet_aton="yes"
++  extralibs="-lnet"
++fi
++
+ if test -z "$cross_prefix" ; then
+ 
+ # ---
+@@ -985,6 +996,7 @@
+ EOF
+ 
+ have_lrintf="no"
++if test "${cross_prefix}" != "i586-pc-beos-"; then
+ if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
+   have_lrintf="yes"
+   # allanc@chickenandporn.com: cannot execute cross-compiled
+@@ -993,6 +1005,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-10-23 16:00:22.000000000 +0200
++++ ffmpeg/libavcodec/eval.c   2005-10-23 16:05:34.000000000 +0200
 @@ -34,6 +34,8 @@
  #include <string.h>
  #include <math.h>
@@ -10,9 +74,9 @@ diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
  #ifndef NAN
    #define NAN 0
  #endif
-diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
---- ffmpeg.old/libavformat/tcp.c       Mon Sep 29 03:41:30 2003
-+++ ffmpeg/libavformat/tcp.c   Sun Nov  2 02:04:09 2003
+diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
+--- ffmpeg-orig/libavformat/tcp.c      2005-10-23 16:00:22.000000000 +0200
++++ ffmpeg/libavformat/tcp.c   2005-10-23 16:06:19.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <netdb.h>
  #include <sys/time.h>
@@ -21,3 +85,17 @@ diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
  
  typedef struct TCPContext {
      int fd;
+@@ -112,11 +113,13 @@
+                 break;
+         }
+         
++#ifndef __BEOS__
+         /* test error */
+         optlen = sizeof(ret);
+         getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
+         if (ret != 0)
+             goto fail;
++#endif
+     }
+     s->fd = fd;
+     return 0;