r254 - in experimental/ffmpeg/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 28 16:02:45 CET 2007 

Author: sho
Date: 2007-03-28 15:02:39 +0000 (Wed, 28 Mar 2007)
New Revision: 254

Added:
   experimental/ffmpeg/debian/patches/015_build_imgresample.diff
   experimental/ffmpeg/debian/patches/053_rm_demux_crash.diff
   experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
Modified:
   experimental/ffmpeg/debian/changelog
   experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
   experimental/ffmpeg/debian/patches/series
Log:
  * debian/patches/015_build_imgresample.diff:
    + Build imgresample functions even with swscaler activated, or legacy
      applications will stop working.

  * debian/patches/053_rm_demux_crash.diff:
    + New patch: fix a double free with corrupted rm files (Closes: #379922).

  * debian/patches/054_h264_mmx_chroma_mc_crash.diff:
    + New patch: workaround for a buffer overflow in the MMX H264 chroma
      motion compensation until upstream fixes it properly (Closes: #404176).


Modified: experimental/ffmpeg/debian/changelog
===================================================================
--- experimental/ffmpeg/debian/changelog	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/changelog	2007-03-28 15:02:39 UTC (rev 254)
@@ -1,5 +1,16 @@
-ffmpeg (0.cvs20070307-3) UNRELEASED; urgency=low
+ffmpeg (0.cvs20070307-3) experimental; urgency=low
 
+  * debian/patches/015_build_imgresample.diff:
+    + Build imgresample functions even with swscaler activated, or legacy
+      applications will stop working.
+
+  * debian/patches/053_rm_demux_crash.diff:
+    + New patch: fix a double free with corrupted rm files (Closes: #379922).
+
+  * debian/patches/054_h264_mmx_chroma_mc_crash.diff:
+    + New patch: workaround for a buffer overflow in the MMX H264 chroma
+      motion compensation until upstream fixes it properly (Closes: #404176).
+
   * debian/control:
     + Set pkg-multimedia-maintainers as main maintainer.
     + Updated VCS fields.

Added: experimental/ffmpeg/debian/patches/015_build_imgresample.diff
===================================================================
--- experimental/ffmpeg/debian/patches/015_build_imgresample.diff	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/patches/015_build_imgresample.diff	2007-03-28 15:02:39 UTC (rev 254)
@@ -0,0 +1,46 @@
+Index: ffmpeg-0.cvs20070307/libavcodec/Makefile
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile	2007-03-07 14:37:04.000000000 +0100
++++ ffmpeg-0.cvs20070307/libavcodec/Makefile	2007-03-28 16:54:03.000000000 +0200
+@@ -310,9 +310,7 @@
+ 
+ OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
+ 
+-ifneq ($(CONFIG_SWSCALER),yes)
+ OBJS += imgresample.o
+-endif
+ 
+ # i386 mmx specific stuff
+ ifeq ($(TARGET_MMX),yes)
+Index: ffmpeg-0.cvs20070307/tests/Makefile
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/tests/Makefile	2007-03-07 14:37:04.000000000 +0100
++++ ffmpeg-0.cvs20070307/tests/Makefile	2007-03-28 16:18:43.000000000 +0200
+@@ -43,14 +43,6 @@
+ 	@echo
+ endif
+ 
+-ifeq ($(CONFIG_SWSCALER),yes)
+-test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
+-swscale_error:
+-	@echo
+-	@echo "This regression test is incompatible with --enable-swscaler."
+-	@echo
+-	@exit 1
+-endif
+ 
+ seektest: seek_test$(EXESUF)
+ 	@$(SRC_DIR)/seek_test.sh $(SEEK_REFFILE)
+Index: ffmpeg-0.cvs20070307/libavcodec/imgconvert.c
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libavcodec/imgconvert.c	2007-03-28 16:54:10.000000000 +0200
++++ ffmpeg-0.cvs20070307/libavcodec/imgconvert.c	2007-03-28 16:54:20.000000000 +0200
+@@ -2317,7 +2317,7 @@
+ }
+ #endif
+ 
+-#ifndef CONFIG_SWSCALER
++#if 1
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+                 const AVPicture *src, int src_pix_fmt,

Modified: experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff
===================================================================
--- experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/patches/040_only_use_maltivec_when_needed.diff	2007-03-28 15:02:39 UTC (rev 254)
@@ -1,7 +1,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307.orig/configure	2007-03-28 16:07:04.000000000 +0200
++++ ffmpeg-0.cvs20070307/configure	2007-03-28 16:17:39.000000000 +0200
 @@ -1410,11 +1410,13 @@
          if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
              add_cflags "-faltivec"
@@ -35,19 +35,19 @@
  echo "LDCONFIG=$LDCONFIG" >> config.mak
 Index: ffmpeg-0.cvs20070307/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
-@@ -311,7 +311,8 @@
+--- ffmpeg-0.cvs20070307.orig/libavcodec/Makefile	2007-03-28 16:17:35.000000000 +0200
++++ ffmpeg-0.cvs20070307/libavcodec/Makefile	2007-03-28 16:17:59.000000000 +0200
+@@ -310,7 +310,8 @@
+ 
  OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
  
- ifneq ($(CONFIG_SWSCALER),yes)
 -OBJS += imgresample.o
 +OBJS += imgresample.o imgresample_altivec.o
 +imgresample_altivec.o: CFLAGS+= $(ALTIVECFLAGS)
- endif
  
  # i386 mmx specific stuff
-@@ -387,11 +388,22 @@
+ ifeq ($(TARGET_MMX),yes)
+@@ -385,11 +386,22 @@
                                            ppc/fdct_altivec.o         \
                                            ppc/float_altivec.o        \
  
@@ -73,7 +73,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libavcodec/dsputil.h	2007-03-28 16:17:39.000000000 +0200
 @@ -556,12 +556,6 @@
  
  extern int mm_flags;
@@ -90,7 +90,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libavcodec/imgresample.c	2007-03-28 16:17:39.000000000 +0200
 @@ -284,133 +284,6 @@
  }
  #endif
@@ -228,7 +228,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libavcodec/imgresample_altivec.c	2007-03-28 16:17:39.000000000 +0200
 @@ -0,0 +1,164 @@
 +/*
 + * High quality image resampling with polyphase filters
@@ -397,7 +397,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libpostproc/Makefile	2007-03-28 16:17:39.000000000 +0200
 @@ -10,8 +10,10 @@
  LIBVERSION=$(SPPVERSION)
  LIBMAJOR=$(SPPMAJOR)
@@ -421,7 +421,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libpostproc/postprocess.c	2007-03-28 16:17:39.000000000 +0200
 @@ -95,10 +95,6 @@
  
  #include "mangle.h" //FIXME should be supressed
@@ -448,7 +448,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libpostproc/postprocess_altivec.c	2007-03-28 16:17:39.000000000 +0200
 @@ -0,0 +1,614 @@
 +/*
 +    Copyright (C) 2001-2003 Michael Niedermayer (michaelni at gmx.at)
@@ -1066,8 +1066,8 @@
 +
 Index: ffmpeg-0.cvs20070307/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.cvs20070307.orig/libpostproc/postprocess_template.c	2007-03-28 16:17:35.000000000 +0200
++++ ffmpeg-0.cvs20070307/libpostproc/postprocess_template.c	2007-03-28 16:17:39.000000000 +0200
 @@ -3181,7 +3181,10 @@
  }
  #endif //HAVE_MMX
@@ -1095,7 +1095,7 @@
 Index: ffmpeg-0.cvs20070307/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
++++ ffmpeg-0.cvs20070307/libswscale/swscale.c	2007-03-28 16:17:39.000000000 +0200
 @@ -849,7 +849,10 @@
  #undef RENAME
  #define HAVE_ALTIVEC
@@ -1122,7 +1122,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libswscale/swscale_altivec.c	2007-03-28 16:17:39.000000000 +0200
 @@ -0,0 +1,729 @@
 +/*
 + * Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>
@@ -1856,7 +1856,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libswscale/swscale_altivec_template.c	2007-03-28 16:17:39.000000000 +0200
 @@ -390,7 +390,7 @@
    }
  }
@@ -1878,7 +1878,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libswscale/swscale_internal.h	2007-03-28 16:17:39.000000000 +0200
 @@ -21,9 +21,11 @@
  #ifndef SWSCALE_INTERNAL_H
  #define SWSCALE_INTERNAL_H
@@ -1923,7 +1923,7 @@
 Index: ffmpeg-0.cvs20070307/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.cvs20070307/libswscale/Makefile	2007-03-28 16:17:39.000000000 +0200
 @@ -9,8 +9,10 @@
  
  OBJS= swscale.o rgb2rgb.o
@@ -1938,8 +1938,8 @@
  
 Index: ffmpeg-0.cvs20070307/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.cvs20070307.orig/libswscale/swscale_template.c	2007-03-07 14:37:07.000000000 +0100
++++ ffmpeg-0.cvs20070307/libswscale/swscale_template.c	2007-03-28 16:17:39.000000000 +0200
 @@ -2936,7 +2936,10 @@
     }
  }

Added: experimental/ffmpeg/debian/patches/053_rm_demux_crash.diff
===================================================================
--- experimental/ffmpeg/debian/patches/053_rm_demux_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/patches/053_rm_demux_crash.diff	2007-03-28 15:02:39 UTC (rev 254)
@@ -0,0 +1,25 @@
+Index: ffmpeg-0.cvs20060823/libavformat/rm.c
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libavformat/rm.c	2007-03-23 22:42:34.000000000 +0100
++++ ffmpeg-0.cvs20060823/libavformat/rm.c	2007-03-23 22:43:28.000000000 +0100
+@@ -959,9 +959,8 @@
+                 len=len2;
+             rm->remaining_len-= len;
+             av_get_packet(pb, pkt, len);
+-        }
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
++        } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
+             if ((st->codec->codec_id == CODEC_ID_RA_288) ||
+                 (st->codec->codec_id == CODEC_ID_COOK)) {
+                 int x;
+@@ -1013,7 +1012,8 @@
+                 }
+             } else
+                 av_get_packet(pb, pkt, len);
+-        }
++
++        } else goto resync;
+ 
+         if(  (st->discard >= AVDISCARD_NONKEY && !(flags&2))
+            || st->discard >= AVDISCARD_ALL){

Added: experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
===================================================================
--- experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff	2007-03-28 15:02:39 UTC (rev 254)
@@ -0,0 +1,15 @@
+Index: ffmpeg-0.cvs20060823/libavcodec/h264.c
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libavcodec/h264.c	2007-03-26 14:33:03.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/h264.c	2007-03-26 14:33:12.000000000 +0200
+@@ -2890,8 +2890,8 @@
+ 
+     if(   full_mx < 0-extra_width
+        || full_my < 0-extra_height
+-       || full_mx + 16/*FIXME*/ > pic_width + extra_width
+-       || full_my + 16/*FIXME*/ > pic_height + extra_height){
++       || full_mx + 16/*FIXME*/ >= pic_width + extra_width
++       || full_my + 16/*FIXME*/ >= pic_height + extra_height){
+         ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height);
+             src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
+         emu=1;

Modified: experimental/ffmpeg/debian/patches/series
===================================================================
--- experimental/ffmpeg/debian/patches/series	2007-03-28 12:46:02 UTC (rev 253)
+++ experimental/ffmpeg/debian/patches/series	2007-03-28 15:02:39 UTC (rev 254)
@@ -8,9 +8,12 @@
 #020_mmx_intrinsics.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
+015_build_imgresample.diff
 020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff
 040_early_altivec_detection.diff
 040_only_use_maltivec_when_needed.diff
+053_rm_demux_crash.diff
+054_h264_mmx_chroma_mc_crash.diff
 060_fix_avi_skip.diff

More information about the Pkg-multimedia-commits mailing list