* 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 71cbae3af3b477c0df68689fb92f4ed6e1b00513..2b792cba63032081fc26ded131bee1c8a2db078e 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg.patch.cvs
+++ b/extras/contrib/src/Patches/ffmpeg.patch.cvs
@@ -1,7 +1,7 @@
 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-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"
  ;;
@@ -10,16 +10,24 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
  CFLAGS="$CFLAGS -fno-expensive-optimizations"
  ;;
  esac
-@@ -374,7 +374,7 @@
+@@ -448,7 +448,7 @@
    ;;
    --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
    ;;
 -  --extra-libs=*) extralibs=${opt#--extra-libs=}
 +  --extra-libs=*) extralibs="$extralibs ${opt#--extra-libs=}"
    ;;
-   --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
+   --build-suffix=*) BUILDSUF=${opt#--build-suffix=}
    ;;
-@@ -709,6 +709,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}"
  strip="${cross_prefix}${strip}"
  
@@ -38,9 +46,25 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
  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-01-17 19:25:32.000000000 +0100
-+++ ffmpeg/libavcodec/eval.c   2005-02-18 21:12:57.000000000 +0100
+--- 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>
@@ -51,8 +75,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-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>
@@ -61,7 +85,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;
          }