r212 - feisty/ffmpeg/debian/patches

siretart at alioth.debian.org siretart at alioth.debian.org
Fri Mar 16 23:51:35 CET 2007


Author: siretart
Date: 2007-03-16 17:29:26 +0000 (Fri, 16 Mar 2007)
New Revision: 212

Modified:
   feisty/ffmpeg/debian/patches/005_altivec_flags.diff
   feisty/ffmpeg/debian/patches/005_m68k_workaround.diff
   feisty/ffmpeg/debian/patches/005_runtime_cpudetect.diff
   feisty/ffmpeg/debian/patches/006_mips_pthreads.diff
   feisty/ffmpeg/debian/patches/010_shared_library_versioning.diff
   feisty/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
   feisty/ffmpeg/debian/patches/020_mmx_optims.diff
   feisty/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
   feisty/ffmpeg/debian/patches/060_fix_avi_skip.diff
Log:
refreshes for new svn snapshot

Modified: feisty/ffmpeg/debian/patches/005_altivec_flags.diff
===================================================================
--- feisty/ffmpeg/debian/patches/005_altivec_flags.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/005_altivec_flags.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: ffmpeg-0.cvs20070310/configure
 ===================================================================
---- ffmpeg.svn.orig/configure	2007-03-05 20:57:28.000000000 +0100
-+++ ffmpeg.svn/configure	2007-03-05 20:57:34.000000000 +0100
-@@ -1446,7 +1446,7 @@
+--- ffmpeg-0.cvs20070310.orig/configure	2007-03-10 18:17:54.000000000 +0100
++++ ffmpeg-0.cvs20070310/configure	2007-03-10 18:19:14.000000000 +0100
+@@ -1410,7 +1410,7 @@
          if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
              add_cflags "-faltivec"
          else

Modified: feisty/ffmpeg/debian/patches/005_m68k_workaround.diff
===================================================================
--- feisty/ffmpeg/debian/patches/005_m68k_workaround.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/005_m68k_workaround.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: ffmpeg-0.cvs20070310/configure
 ===================================================================
---- ffmpeg.svn.orig/configure	2007-03-05 20:57:08.000000000 +0100
-+++ ffmpeg.svn/configure	2007-03-05 20:57:28.000000000 +0100
-@@ -1827,6 +1827,8 @@
+--- ffmpeg-0.cvs20070310.orig/configure	2007-03-10 14:24:54.000000000 +0100
++++ ffmpeg-0.cvs20070310/configure	2007-03-10 18:17:54.000000000 +0100
+@@ -1712,6 +1712,8 @@
      if test -n "`$cc -v 2>&1 | grep xlc`"; then
          add_cflags  "-O5"
          add_ldflags "-O5"

Modified: feisty/ffmpeg/debian/patches/005_runtime_cpudetect.diff
===================================================================
--- feisty/ffmpeg/debian/patches/005_runtime_cpudetect.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/005_runtime_cpudetect.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: ffmpeg-0.cvs20070310/configure
 ===================================================================
---- ffmpeg.svn.orig/configure	2007-03-05 20:45:57.000000000 +0100
-+++ ffmpeg.svn/configure	2007-03-05 20:49:10.000000000 +0100
-@@ -2012,6 +2012,10 @@
+--- ffmpeg-0.cvs20070310.orig/configure	2007-03-10 18:19:14.000000000 +0100
++++ ffmpeg-0.cvs20070310/configure	2007-03-10 18:19:43.000000000 +0100
+@@ -1908,6 +1908,10 @@
    echo "#define __CPU__ 586" >> $TMPH
  fi
  

Modified: feisty/ffmpeg/debian/patches/006_mips_pthreads.diff
===================================================================
--- feisty/ffmpeg/debian/patches/006_mips_pthreads.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/006_mips_pthreads.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg.svn/configure
+Index: ffmpeg-0.cvs20070310/configure
 ===================================================================
---- ffmpeg.svn.orig/configure	2007-03-05 20:57:37.000000000 +0100
-+++ ffmpeg.svn/configure	2007-03-05 20:57:39.000000000 +0100
-@@ -1551,6 +1551,10 @@
+--- ffmpeg-0.cvs20070310.orig/configure	2007-03-10 18:19:43.000000000 +0100
++++ ffmpeg-0.cvs20070310/configure	2007-03-10 18:19:57.000000000 +0100
+@@ -1521,6 +1521,10 @@
  # check for some common methods of building with pthread support
  # do this before the optional library checks as some of them require pthreads
  if enabled pthreads; then

Modified: feisty/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- feisty/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/010_shared_library_versioning.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: ffmpeg.feisty/configure
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 17:07:42.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure	2007-03-09 17:18:29.000000000 +0100
-@@ -1924,11 +1924,11 @@
+--- ffmpeg.feisty.orig/configure	2007-03-15 23:54:41.000000000 +0100
++++ ffmpeg.feisty/configure	2007-03-15 23:54:53.000000000 +0100
+@@ -1925,11 +1925,11 @@
    echo "BUILD_DOC=yes" >> config.mak
  fi
  
@@ -19,7 +19,7 @@
  
  
  
-@@ -2057,9 +2057,9 @@
+@@ -2058,9 +2058,9 @@
  pkgconfig_generate(){
  name=$1
  comment=$2
@@ -31,7 +31,7 @@
  include=$6
  cat <<EOF >$name.pc
  prefix=$PREFIX
-@@ -2081,9 +2081,9 @@
+@@ -2082,9 +2082,9 @@
  name=$1
  shortname=${name#lib}
  comment=$2
@@ -43,10 +43,10 @@
  cat <<EOF >$name-uninstalled.pc
  prefix=
  exec_prefix=
-Index: ffmpeg-0.cvs20070307/libavutil/avutil.h
+Index: ffmpeg.feisty/libavutil/avutil.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavutil/avutil.h	2007-03-07 14:37:01.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavutil/avutil.h	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/libavutil/avutil.h	2007-03-15 23:51:51.000000000 +0100
++++ ffmpeg.feisty/libavutil/avutil.h	2007-03-15 23:54:53.000000000 +0100
 @@ -35,7 +35,7 @@
  #define AV_TOSTRING(s) #s
  
@@ -56,36 +56,36 @@
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+Index: ffmpeg.feisty/libavcodec/avcodec.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/libavcodec/avcodec.h	2007-03-15 23:51:53.000000000 +0100
++++ ffmpeg.feisty/libavcodec/avcodec.h	2007-03-15 23:57:25.000000000 +0100
 @@ -38,7 +38,7 @@
  #define AV_TOSTRING(s) #s
  
- #define LIBAVCODEC_VERSION_INT  ((51<<16)+(38<<8)+0)
--#define LIBAVCODEC_VERSION      51.38.0
-+#define LIBAVCODEC_VERSION      1d.51.38.0
+ #define LIBAVCODEC_VERSION_INT  ((51<<16)+(39<<8)+0)
+-#define LIBAVCODEC_VERSION      51.39.0
++#define LIBAVCODEC_VERSION      1d.51.39.0
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: ffmpeg-0.cvs20070307/libavformat/avformat.h
+Index: ffmpeg.feisty/libavformat/avformat.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavformat/avformat.h	2007-03-07 14:37:06.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavformat/avformat.h	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/libavformat/avformat.h	2007-03-15 23:51:53.000000000 +0100
++++ ffmpeg.feisty/libavformat/avformat.h	2007-03-15 23:56:58.000000000 +0100
 @@ -26,7 +26,7 @@
  #endif
  
- #define LIBAVFORMAT_VERSION_INT ((51<<16)+(10<<8)+0)
--#define LIBAVFORMAT_VERSION     51.10.0
-+#define LIBAVFORMAT_VERSION     1d.51.10.0
+ #define LIBAVFORMAT_VERSION_INT ((51<<16)+(11<<8)+0)
+-#define LIBAVFORMAT_VERSION     51.11.0
++#define LIBAVFORMAT_VERSION     1d.51.11.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20070307/common.mak
+Index: ffmpeg.feisty/common.mak
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/common.mak	2007-03-07 14:37:06.000000000 +0100
-+++ ffmpeg-0.cvs20070307/common.mak	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/common.mak	2007-03-15 23:51:53.000000000 +0100
++++ ffmpeg.feisty/common.mak	2007-03-15 23:54:53.000000000 +0100
 @@ -68,7 +68,7 @@
  	cd "$(shlibdir)" && \
  		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -95,10 +95,10 @@
  	$(SLIB_INSTALL_EXTRA_CMD)
  
  install-lib-static: $(LIB)
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.h
+Index: ffmpeg.feisty/libpostproc/postprocess.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.h	2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess.h	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/libpostproc/postprocess.h	2007-03-15 23:51:53.000000000 +0100
++++ ffmpeg.feisty/libpostproc/postprocess.h	2007-03-15 23:54:53.000000000 +0100
 @@ -32,7 +32,7 @@
  #endif
  
@@ -108,10 +108,10 @@
  #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
  
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
-Index: ffmpeg-0.cvs20070307/libswscale/swscale.h
+Index: ffmpeg.feisty/libswscale/swscale.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale.h	2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale.h	2007-03-09 17:07:44.000000000 +0100
+--- ffmpeg.feisty.orig/libswscale/swscale.h	2007-03-15 23:51:54.000000000 +0100
++++ ffmpeg.feisty/libswscale/swscale.h	2007-03-15 23:54:53.000000000 +0100
 @@ -37,7 +37,7 @@
  #define AV_TOSTRING(s) #s
  

Modified: feisty/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
===================================================================
--- feisty/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20070310/libavcodec/i386/dsputil_mmx.c
 ===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:22:05.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:22:11.000000000 +0200
-@@ -3095,7 +3095,7 @@
+--- ffmpeg-0.cvs20070310.orig/libavcodec/i386/dsputil_mmx.c	2007-02-24 12:58:52.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/i386/dsputil_mmx.c	2007-03-10 18:20:38.000000000 +0100
+@@ -3462,7 +3462,7 @@
              c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
          }
  
@@ -11,11 +11,11 @@
          if(mm_flags & MM_SSE2){
              c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
              c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
-Index: ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c
+Index: ffmpeg-0.cvs20070310/libavcodec/i386/snowdsp_mmx.c
 ===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/i386/snowdsp_mmx.c	2006-07-24 17:11:17.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c	2006-07-24 17:22:11.000000000 +0200
-@@ -21,6 +21,7 @@
+--- ffmpeg-0.cvs20070310.orig/libavcodec/i386/snowdsp_mmx.c	2007-01-30 11:31:34.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/i386/snowdsp_mmx.c	2007-03-10 18:20:38.000000000 +0100
+@@ -23,6 +23,7 @@
  #include "../snow.h"
  #include "x86_cpu.h"
  
@@ -23,7 +23,7 @@
  void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){
      const int w2= (width+1)>>1;
      // SSE2 code runs faster with pointers aligned on a 32-byte boundary.
-@@ -915,3 +916,4 @@
+@@ -919,3 +920,4 @@
      else
          ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
  }

Modified: feisty/ffmpeg/debian/patches/020_mmx_optims.diff
===================================================================
--- feisty/ffmpeg/debian/patches/020_mmx_optims.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/020_mmx_optims.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060724/libavcodec/Makefile
+Index: ffmpeg-0.cvs20070310/libavcodec/Makefile
 ===================================================================
---- ffmpeg-0.cvs20060724.orig/libavcodec/Makefile	2006-07-24 17:11:20.000000000 +0200
-+++ ffmpeg-0.cvs20060724/libavcodec/Makefile	2006-07-24 17:22:05.000000000 +0200
-@@ -285,6 +285,7 @@
+--- ffmpeg-0.cvs20070310.orig/libavcodec/Makefile	2007-03-09 14:57:42.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/Makefile	2007-03-10 18:20:15.000000000 +0100
+@@ -329,6 +329,7 @@
          i386/fft_3dn.o \
          i386/fft_3dn2.o \
  

Modified: feisty/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
===================================================================
--- feisty/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,7 +1,7 @@
-Index: ffmpeg-0.cvs20070307/configure
+Index: ffmpeg-0.cvs20070310/configure
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 14:28:38.000000000 +0100
-+++ ffmpeg-0.cvs20070307/configure	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/configure	2007-03-10 18:20:15.000000000 +0100
++++ ffmpeg-0.cvs20070310/configure	2007-03-10 18:20:53.000000000 +0100
 @@ -1410,11 +1410,13 @@
          if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
              add_cflags "-faltivec"
@@ -33,10 +33,10 @@
  echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
  echo "LDFLAGS=$LDFLAGS" >> config.mak
  echo "LDCONFIG=$LDCONFIG" >> config.mak
-Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
+Index: ffmpeg-0.cvs20070310/libavcodec/Makefile
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile	2007-03-09 14:28:38.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/Makefile	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libavcodec/Makefile	2007-03-10 18:20:15.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/Makefile	2007-03-10 18:20:53.000000000 +0100
 @@ -311,7 +311,8 @@
  OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
  
@@ -70,10 +70,10 @@
  endif
  
  OBJS-$(TARGET_ARCH_BFIN)               += bfin/dsputil_bfin.o \
-Index: ffmpeg-0.cvs20070307/libavcodec/dsputil.h
+Index: ffmpeg-0.cvs20070310/libavcodec/dsputil.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/dsputil.h	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/dsputil.h	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libavcodec/dsputil.h	2007-01-30 11:31:34.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/dsputil.h	2007-03-10 18:20:53.000000000 +0100
 @@ -556,12 +556,6 @@
  
  extern int mm_flags;
@@ -87,10 +87,10 @@
  #define DECLARE_ALIGNED_8(t,v)    t v __attribute__ ((aligned (16)))
  #define STRIDE_ALIGN 16
  
-Index: ffmpeg-0.cvs20070307/libavcodec/imgresample.c
+Index: ffmpeg-0.cvs20070310/libavcodec/imgresample.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libavcodec/imgresample.c	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libavcodec/imgresample.c	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libavcodec/imgresample.c	2007-03-04 12:53:11.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/imgresample.c	2007-03-10 18:20:53.000000000 +0100
 @@ -284,133 +284,6 @@
  }
  #endif
@@ -225,10 +225,10 @@
  /* slow version to handle limit cases. Does not need optimisation */
  static void h_resample_slow(uint8_t *dst, int dst_width,
                              const uint8_t *src, int src_width,
-Index: ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c
+Index: ffmpeg-0.cvs20070310/libavcodec/imgresample_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libavcodec/imgresample_altivec.c	2007-03-09 14:28:38.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavcodec/imgresample_altivec.c	2007-03-10 18:20:53.000000000 +0100
 @@ -0,0 +1,164 @@
 +/*
 + * High quality image resampling with polyphase filters
@@ -394,10 +394,10 @@
 +}
 +#endif
 +
-Index: ffmpeg-0.cvs20070307/libpostproc/Makefile
+Index: ffmpeg-0.cvs20070310/libpostproc/Makefile
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/Makefile	2007-03-07 14:37:04.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/Makefile	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libpostproc/Makefile	2007-02-27 01:18:38.000000000 +0100
++++ ffmpeg-0.cvs20070310/libpostproc/Makefile	2007-03-10 18:20:53.000000000 +0100
 @@ -10,8 +10,10 @@
  LIBVERSION=$(SPPVERSION)
  LIBMAJOR=$(SPPMAJOR)
@@ -418,10 +418,10 @@
 +postprocess_altivec_pic.o: postprocess_altivec.c
 +	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
  
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess.c
+Index: ffmpeg-0.cvs20070310/libpostproc/postprocess.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess.c	2007-03-07 11:17:32.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess.c	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libpostproc/postprocess.c	2006-12-08 01:35:08.000000000 +0100
++++ ffmpeg-0.cvs20070310/libpostproc/postprocess.c	2007-03-10 18:20:53.000000000 +0100
 @@ -95,10 +95,6 @@
  
  #include "mangle.h" //FIXME should be supressed
@@ -445,10 +445,10 @@
  #endif
  #endif //ARCH_POWERPC
  
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c
+Index: ffmpeg-0.cvs20070310/libpostproc/postprocess_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess_altivec.c	2007-03-09 14:28:38.000000000 +0100
++++ ffmpeg-0.cvs20070310/libpostproc/postprocess_altivec.c	2007-03-10 18:20:53.000000000 +0100
 @@ -0,0 +1,614 @@
 +/*
 +    Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1064,10 +1064,10 @@
 +#endif
 +#endif //ARCH_POWERPC
 +
-Index: ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c
+Index: ffmpeg-0.cvs20070310/libpostproc/postprocess_template.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libpostproc/postprocess_template.c	2007-03-09 14:28:38.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libpostproc/postprocess_template.c	2007-03-10 18:20:29.000000000 +0100
++++ ffmpeg-0.cvs20070310/libpostproc/postprocess_template.c	2007-03-10 18:20:53.000000000 +0100
 @@ -3181,7 +3181,10 @@
  }
  #endif //HAVE_MMX
@@ -1092,11 +1092,11 @@
          QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c2)
  {
          PPContext __attribute__((aligned(8))) c= *c2; //copy to stack for faster access
-Index: ffmpeg-0.cvs20070307/libswscale/swscale.c
+Index: ffmpeg-0.cvs20070310/libswscale/swscale.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale.c	2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale.c	2007-03-09 14:28:38.000000000 +0100
-@@ -849,7 +849,10 @@
+--- ffmpeg-0.cvs20070310.orig/libswscale/swscale.c	2007-03-08 11:02:49.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/swscale.c	2007-03-10 18:20:53.000000000 +0100
+@@ -850,7 +850,10 @@
  #undef RENAME
  #define HAVE_ALTIVEC
  #define RENAME(a) a ## _altivec
@@ -1108,7 +1108,7 @@
  #endif
  #endif //ARCH_POWERPC
  
-@@ -2241,8 +2244,8 @@
+@@ -2242,8 +2245,8 @@
  				srcFilter->chrV, dstFilter->chrV, c->param);
  
  #ifdef HAVE_ALTIVEC
@@ -1119,10 +1119,10 @@
  
  		for (i=0;i<c->vLumFilterSize*c->dstH;i++) {
                    int j;
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_altivec.c
+Index: ffmpeg-0.cvs20070310/libswscale/swscale_altivec.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_altivec.c	2007-03-09 14:58:04.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/swscale_altivec.c	2007-03-10 18:20:53.000000000 +0100
 @@ -0,0 +1,729 @@
 +/*
 + * Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>
@@ -1853,10 +1853,10 @@
 +#define RENAME(a) a ## _altivec
 +#include "swscale_template.c"
 +
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_altivec_template.c
+Index: ffmpeg-0.cvs20070310/libswscale/swscale_altivec_template.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_altivec_template.c	2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_altivec_template.c	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libswscale/swscale_altivec_template.c	2007-02-25 11:27:43.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/swscale_altivec_template.c	2007-03-10 18:20:53.000000000 +0100
 @@ -390,7 +390,7 @@
    }
  }
@@ -1875,10 +1875,10 @@
       int srcSliceH, uint8_t* dstParam[], int dstStride_a[]) {
    uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
    // yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_internal.h
+Index: ffmpeg-0.cvs20070310/libswscale/swscale_internal.h
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_internal.h	2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_internal.h	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libswscale/swscale_internal.h	2007-02-22 01:18:10.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/swscale_internal.h	2007-03-10 18:20:53.000000000 +0100
 @@ -21,9 +21,11 @@
  #ifndef SWSCALE_INTERNAL_H
  #define SWSCALE_INTERNAL_H
@@ -1920,10 +1920,10 @@
  
  #endif
  
-Index: ffmpeg-0.cvs20070307/libswscale/Makefile
+Index: ffmpeg-0.cvs20070310/libswscale/Makefile
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/Makefile	2007-03-07 14:37:07.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/Makefile	2007-03-09 14:28:38.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libswscale/Makefile	2007-02-27 01:19:01.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/Makefile	2007-03-10 18:20:53.000000000 +0100
 @@ -9,8 +9,10 @@
  
  OBJS= swscale.o rgb2rgb.o
@@ -1936,10 +1936,10 @@
  
  HEADERS = swscale.h rgb2rgb.h
  
-Index: ffmpeg-0.cvs20070307/libswscale/swscale_template.c
+Index: ffmpeg-0.cvs20070310/libswscale/swscale_template.c
 ===================================================================
---- ffmpeg-0.cvs20070307.orig/libswscale/swscale_template.c	2007-03-09 15:00:41.000000000 +0100
-+++ ffmpeg-0.cvs20070307/libswscale/swscale_template.c	2007-03-09 15:01:16.000000000 +0100
+--- ffmpeg-0.cvs20070310.orig/libswscale/swscale_template.c	2007-03-01 20:48:40.000000000 +0100
++++ ffmpeg-0.cvs20070310/libswscale/swscale_template.c	2007-03-10 18:20:53.000000000 +0100
 @@ -2936,7 +2936,10 @@
     }
  }

Modified: feisty/ffmpeg/debian/patches/060_fix_avi_skip.diff
===================================================================
--- feisty/ffmpeg/debian/patches/060_fix_avi_skip.diff	2007-03-16 17:28:38 UTC (rev 211)
+++ feisty/ffmpeg/debian/patches/060_fix_avi_skip.diff	2007-03-16 17:29:26 UTC (rev 212)
@@ -1,6 +1,8 @@
---- ffmpeg-0.cvs20060329.orig/libavformat/avidec.c
-+++ ffmpeg-0.cvs20060329/libavformat/avidec.c
-@@ -594,7 +594,8 @@
+Index: ffmpeg-0.cvs20070310/libavformat/avidec.c
+===================================================================
+--- ffmpeg-0.cvs20070310.orig/libavformat/avidec.c	2007-02-13 01:38:16.000000000 +0100
++++ ffmpeg-0.cvs20070310/libavformat/avidec.c	2007-03-10 18:21:02.000000000 +0100
+@@ -657,7 +657,8 @@
  
          if (i >= avi->movi_end) {
              if (avi->is_odml) {




More information about the Pkg-multimedia-commits mailing list