r251 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-26 12:36:27 +0000 (Mon, 26 Mar 2007)
New Revision: 251

Added:
   unstable/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
Log:
  * 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: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-03-26 08:40:51 UTC (rev 250)
+++ unstable/ffmpeg/debian/changelog	2007-03-26 12:36:27 UTC (rev 251)
@@ -6,6 +6,10 @@
   * 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: unstable/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff	2007-03-26 08:40:51 UTC (rev 250)
+++ unstable/ffmpeg/debian/patches/054_h264_mmx_chroma_mc_crash.diff	2007-03-26 12:36:27 UTC (rev 251)
@@ -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: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2007-03-26 08:40:51 UTC (rev 250)
+++ unstable/ffmpeg/debian/patches/series	2007-03-26 12:36:27 UTC (rev 251)
@@ -18,4 +18,5 @@
 051_asf-misc-security-fixes.diff
 052_base64_encode_crash.diff
 053_rm_demux_crash.diff
+054_h264_mmx_chroma_mc_crash.diff
 060_fix_avi_skip.diff