[SCM] libav/jessie: Removed, included upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Jun 12 09:41:47 UTC 2016


The following commit has been merged in the jessie branch:
commit 7fb2bd0958b3467fa18e5f5074b6fd7dcb2a3086
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jun 12 11:33:30 2016 +0200

    Removed, included upstream

diff --git a/debian/patches/CVE-2016-2326.patch b/debian/patches/CVE-2016-2326.patch
deleted file mode 100644
index f2eb1fa..0000000
--- a/debian/patches/CVE-2016-2326.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: avformat/asfenc: Check pts
-Origin: other, https://git.videolan.org/?p=ffmpeg.git;a=commit;h=7c0b84d89911b2035161f5ef51aafbfcc84aa9e2
-
---- libav-11.6.orig/libavformat/asfenc.c
-+++ libav-11.6/libavformat/asfenc.c
-@@ -847,6 +847,11 @@ static int asf_write_packet(AVFormatCont
- 
-     pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
-     assert(pts != AV_NOPTS_VALUE);
-+    if (   pts < - PREROLL_TIME
-+        || pts > (INT_MAX-3)/10000LL * ASF_INDEXED_INTERVAL - PREROLL_TIME) {
-+        av_log(s, AV_LOG_ERROR, "input pts %"PRId64" is invalid\n", pts);
-+        return AVERROR(EINVAL);
-+    }
-     duration      = pts * 10000;
-     asf->duration = FFMAX(asf->duration, duration + pkt->duration * 10000);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 02762a4..4d3bd8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02-configure-disable-ebx-gcc-4.9.patch
 03-disable-configuration-warnings.patch
-CVE-2016-2326.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list