git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/ffmpeg.patch.cvs

   1 diff -ru ffmpeg.old/configure ffmpeg/configure
   2 --- ffmpeg.old/configure        Sat Nov  1 15:29:32 2003
   3 +++ ffmpeg/configure    Sun Nov  2 02:04:09 2003
   4 @@ -426,21 +426,21 @@
   5  #Darwin CC versions
   6  if test $targetos = Darwin; then
   7      if test -n "`$cc -v 2>&1 | grep xlc`"; then
   8 -       CFLAGS="-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
   9 +       CFLAGS="$CFLAGS -qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
  10      else
  11         gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
  12         case "$gcc_version" in
  13             *2.95*)
  14 -               CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
  15 +               CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
  16                 ;;
  17             *3.1*)
  18 -               CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
  19 +               CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
  20                 ;;
  21             *3.3*)
  22 -               CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL -Wno-sign-compare"
  23 +               CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL -Wno-sign-compare"
  24                 ;;
  25             *)
  26 -               CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
  27 +               CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
  28                 ;;
  29         esac
  30      fi
  31 diff -ru ffmpeg.old/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h
  32 --- ffmpeg.old/libavcodec/dsputil.h     Sat Oct 25 02:32:54 2003
  33 +++ ffmpeg/libavcodec/dsputil.h Sun Nov  2 02:04:09 2003
  34 @@ -487,6 +487,8 @@
  35            +name8(s, dst+8+8*stride, src+8+8*stride, stride);\
  36  }
  37
  38 +/* Meuuh power */
  39 +#undef HAVE_LRINTF
  40  #ifndef HAVE_LRINTF
  41  /* XXX: add ISOC specific test to avoid specific BSD testing. */
  42  /* better than nothing implementation. */
  43 diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
  44 --- ffmpeg.old/libavcodec/eval.c        Thu Mar  6 12:32:01 2003
  45 +++ ffmpeg/libavcodec/eval.c    Sun Nov  2 02:04:09 2003
  46 @@ -34,6 +34,8 @@
  47  #include <string.h>
  48  #include <math.h>
  49
  50 +/* Meuuh power */
  51 +#undef NAN
  52  #ifndef NAN
  53    #define NAN 0
  54  #endif
  55 diff -ru ffmpeg.old/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
  56 --- ffmpeg.old/libavcodec/libpostproc/Makefile  Sun May 11 13:26:35 2003
  57 +++ ffmpeg/libavcodec/libpostproc/Makefile      Sun Nov  2 19:20:31 2003
  58 @@ -55,6 +55,9 @@
  59         ldconfig || true
  60         mkdir -p $(prefix)/include/postproc
  61         install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
  62 +else
  63 +       mkdir -p $(prefix)/include/libpostproc
  64 +       install -m 644 postprocess.h $(prefix)/include/libpostproc/postprocess.h
  65  endif
  66
  67
  68 diff -ru ffmpeg.old/libavcodec/resample.c ffmpeg/libavcodec/resample.c
  69 --- ffmpeg.old/libavcodec/resample.c    Mon Sep  8 23:05:43 2003
  70 +++ ffmpeg/libavcodec/resample.c        Sun Nov  2 02:04:09 2003
  71 @@ -49,7 +49,7 @@
  72  static void init_mono_resample(ReSampleChannelContext *s, float ratio)
  73  {
  74      ratio = 1.0 / ratio;
  75 -    s->iratio = (int)floorf(ratio);
  76 +    s->iratio = (int)floor(ratio);
  77      if (s->iratio == 0)
  78          s->iratio = 1;
  79      s->incr = (int)((ratio / s->iratio) * FRAC);
  80 diff -ru ffmpeg.old/libavformat/rtsp.c ffmpeg/libavformat/rtsp.c
  81 --- ffmpeg.old/libavformat/rtsp.c       Wed Oct 29 15:25:27 2003
  82 +++ ffmpeg/libavformat/rtsp.c   Sun Nov  2 02:04:09 2003
  83 @@ -20,6 +20,7 @@
  84
  85  #include <unistd.h> /* for select() prototype */
  86  #include <sys/time.h>
  87 +#include <unistd.h>
  88  #include <netinet/in.h>
  89  #include <sys/socket.h>
  90  #ifndef __BEOS__
  91 diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
  92 --- ffmpeg.old/libavformat/tcp.c        Mon Sep 29 03:41:30 2003
  93 +++ ffmpeg/libavformat/tcp.c    Sun Nov  2 02:04:09 2003
  94 @@ -32,6 +32,7 @@
  95  #include <netdb.h>
  96  #include <sys/time.h>
  97  #include <fcntl.h>
  98 +#define socklen_t int
  99
 100  typedef struct TCPContext {
 101      int fd;