[SCM] ffmpeg/master: Drop patches, included upstream
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Fri Feb 10 22:51:05 UTC 2017
The following commit has been merged in the master branch:
commit 35dabe3e2d58d331d06e06eb088882b10f40c960
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Fri Feb 10 22:24:12 2017 +0100
Drop patches, included upstream
- lavf-chromaprint-Update-for-version-1.4.patch
- libopenmpt-add-missing-avio_read-return-value-check.patch
- swscale-save-ebx-register-when-it-is-not-available.patch
diff --git a/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch b/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch
deleted file mode 100644
index 47cf0c0..0000000
--- a/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Georgi D. Sotirov" <gdsotirov at dir.bg>
-Date: Tue, 6 Dec 2016 21:07:59 +0100
-Subject: lavf/chromaprint: Update for version 1.4
-
-Fixes ticket #5997.
----
- libavformat/chromaprint.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
-index 8c9a6c01..4da02bef 100644
---- a/libavformat/chromaprint.c
-+++ b/libavformat/chromaprint.c
-@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext {
- int silence_threshold;
- int algorithm;
- FingerprintFormat fp_format;
-+#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0)
-+ ChromaprintContext *ctx;
-+#else
- ChromaprintContext ctx;
-+#endif
- } ChromaprintMuxContext;
-
- static void cleanup(ChromaprintMuxContext *cpr)
diff --git a/debian/patches/libopenmpt-add-missing-avio_read-return-value-check.patch b/debian/patches/libopenmpt-add-missing-avio_read-return-value-check.patch
deleted file mode 100644
index c7b5d3c..0000000
--- a/debian/patches/libopenmpt-add-missing-avio_read-return-value-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
-Date: Sun, 1 Jan 2017 20:27:50 +0100
-Subject: libopenmpt: add missing avio_read return value check
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-This fixes heap-buffer-overflows in libopenmpt caused by interpreting
-the negative size value as unsigned size_t.
-
-Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Reviewed-by: Jörn Heusipp <osmanx at problemloesungsmaschine.de>
-Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
----
- libavformat/libopenmpt.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c
-index e7091ef9..35fd28f5 100644
---- a/libavformat/libopenmpt.c
-+++ b/libavformat/libopenmpt.c
-@@ -82,6 +82,11 @@ static int read_header_openmpt(AVFormatContext *s)
- if (!buf)
- return AVERROR(ENOMEM);
- size = avio_read(s->pb, buf, size);
-+ if (size < 0) {
-+ av_log(s, AV_LOG_ERROR, "Reading input buffer failed.\n");
-+ av_freep(&buf);
-+ return size;
-+ }
-
- openmpt->module = openmpt_module_create_from_memory(buf, size, openmpt_logfunc, s, NULL);
- av_freep(&buf);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 15af50c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-lavf-chromaprint-Update-for-version-1.4.patch
-swscale-save-ebx-register-when-it-is-not-available.patch
-libopenmpt-add-missing-avio_read-return-value-check.patch
diff --git a/debian/patches/swscale-save-ebx-register-when-it-is-not-available.patch b/debian/patches/swscale-save-ebx-register-when-it-is-not-available.patch
deleted file mode 100644
index d6bab6c..0000000
--- a/debian/patches/swscale-save-ebx-register-when-it-is-not-available.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Date: Fri, 16 Dec 2016 02:29:56 +0100
-Subject: swscale: save ebx register when it is not available
-
-Configure checks if the ebx register can be used for asm and it has to
-be saved if and only if this is not the case.
-Without this the build fails when configuring with --toolchain=hardened
---disable-pic on i386 using gcc 4.8:
-error: PIC register clobbered by '%ebx' in 'asm'
-
-In that case gcc 4.8 reserves the ebx register for the GOT needed for
-PIE, so it can't be used in asm directly.
-
-Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
-Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
----
- libswscale/x86/hscale_fast_bilinear_simd.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/libswscale/x86/hscale_fast_bilinear_simd.c b/libswscale/x86/hscale_fast_bilinear_simd.c
-index 2cba5f0a..60a2cbfc 100644
---- a/libswscale/x86/hscale_fast_bilinear_simd.c
-+++ b/libswscale/x86/hscale_fast_bilinear_simd.c
-@@ -199,7 +199,7 @@ void ff_hyscale_fast_mmxext(SwsContext *c, int16_t *dst,
- #if ARCH_X86_64
- uint64_t retsave;
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- uint64_t ebxsave;
- #endif
- #endif
-@@ -209,7 +209,7 @@ void ff_hyscale_fast_mmxext(SwsContext *c, int16_t *dst,
- "mov -8(%%rsp), %%"FF_REG_a" \n\t"
- "mov %%"FF_REG_a", %5 \n\t" // retsave
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- "mov %%"FF_REG_b", %5 \n\t" // ebxsave
- #endif
- #endif
-@@ -255,7 +255,7 @@ void ff_hyscale_fast_mmxext(SwsContext *c, int16_t *dst,
- "mov %5, %%"FF_REG_a" \n\t"
- "mov %%"FF_REG_a", -8(%%rsp) \n\t"
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- "mov %5, %%"FF_REG_b" \n\t"
- #endif
- #endif
-@@ -264,12 +264,12 @@ void ff_hyscale_fast_mmxext(SwsContext *c, int16_t *dst,
- #if ARCH_X86_64
- ,"m"(retsave)
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- ,"m" (ebxsave)
- #endif
- #endif
- : "%"FF_REG_a, "%"FF_REG_c, "%"FF_REG_d, "%"FF_REG_S, "%"FF_REG_D
--#if ARCH_X86_64 || !defined(PIC)
-+#if ARCH_X86_64 || HAVE_EBX_AVAILABLE
- ,"%"FF_REG_b
- #endif
- );
-@@ -289,7 +289,7 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2,
- #if ARCH_X86_64
- DECLARE_ALIGNED(8, uint64_t, retsave);
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- DECLARE_ALIGNED(8, uint64_t, ebxsave);
- #endif
- #endif
-@@ -298,7 +298,7 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2,
- "mov -8(%%rsp), %%"FF_REG_a" \n\t"
- "mov %%"FF_REG_a", %7 \n\t" // retsave
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- "mov %%"FF_REG_b", %7 \n\t" // ebxsave
- #endif
- #endif
-@@ -332,7 +332,7 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2,
- "mov %7, %%"FF_REG_a" \n\t"
- "mov %%"FF_REG_a", -8(%%rsp) \n\t"
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- "mov %7, %%"FF_REG_b" \n\t"
- #endif
- #endif
-@@ -341,12 +341,12 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2,
- #if ARCH_X86_64
- ,"m"(retsave)
- #else
--#if defined(PIC)
-+#if !HAVE_EBX_AVAILABLE
- ,"m" (ebxsave)
- #endif
- #endif
- : "%"FF_REG_a, "%"FF_REG_c, "%"FF_REG_d, "%"FF_REG_S, "%"FF_REG_D
--#if ARCH_X86_64 || !defined(PIC)
-+#if ARCH_X86_64 || HAVE_EBX_AVAILABLE
- ,"%"FF_REG_b
- #endif
- );
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list