r154 - in unstable/ffmpeg/debian: . patches
Samuel Hocevar
sho at alioth.debian.org
Wed Mar 14 14:22:27 CET 2007
Author: sho
Date: 2007-01-29 15:07:11 +0000 (Mon, 29 Jan 2007)
New Revision: 154
Added:
unstable/ffmpeg/debian/patches/060_fix_avi_skip.diff
Modified:
unstable/ffmpeg/debian/changelog
unstable/ffmpeg/debian/patches/series
Log:
* debian/patches/050_h264-misc-security-fixes.diff:
+ New patch, courtesy of Ben Hutchings: do not attempt to skip the ODML
if the current seek offset is already beyond it.
Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog 2007-01-29 14:41:47 UTC (rev 153)
+++ unstable/ffmpeg/debian/changelog 2007-01-29 15:07:11 UTC (rev 154)
@@ -28,6 +28,9 @@
+ New patch, only use -maltivec with files that use AltiVec intrinsics,
and make sure no codepath leads to these files on a non-AltiVec
machine (Closes: #405926).
+ * debian/patches/050_h264-misc-security-fixes.diff:
+ + New patch, courtesy of Ben Hutchings: do not attempt to skip the ODML
+ if the current seek offset is already beyond it.
-- Loic Minier <lool at dooz.org> Wed, 24 Jan 2007 12:01:12 +0100
Added: unstable/ffmpeg/debian/patches/060_fix_avi_skip.diff
===================================================================
--- unstable/ffmpeg/debian/patches/060_fix_avi_skip.diff 2007-01-29 14:41:47 UTC (rev 153)
+++ unstable/ffmpeg/debian/patches/060_fix_avi_skip.diff 2007-01-29 15:07:11 UTC (rev 154)
@@ -0,0 +1,12 @@
+--- ffmpeg-0.cvs20060329.orig/libavformat/avidec.c
++++ ffmpeg-0.cvs20060329/libavformat/avidec.c
+@@ -594,7 +594,8 @@
+
+ if (i >= avi->movi_end) {
+ if (avi->is_odml) {
+- url_fskip(pb, avi->riff_end - i);
++ if (i < avi->riff_end)
++ url_fskip(pb, avi->riff_end - i);
+ avi->riff_end = avi->movi_end = url_fsize(pb);
+ } else
+ break;
Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series 2007-01-29 14:41:47 UTC (rev 153)
+++ unstable/ffmpeg/debian/patches/series 2007-01-29 15:07:11 UTC (rev 154)
@@ -16,3 +16,4 @@
040_only_use_maltivec_when_needed.diff
050_h264-misc-security-fixes.diff
051_asf-misc-security-fixes.diff
+060_fix_avi_skip.diff
More information about the Pkg-multimedia-commits
mailing list