[SCM] ffmpeg/master: Drop obsolete patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2232d485d0536c0918afff3013f08448ffc038d0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 12 02:20:39 2016 +0200

    Drop obsolete patches

diff --git a/debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch b/debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch
deleted file mode 100644
index 6873c1a..0000000
--- a/debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e675926a4fa6720925bbe708fadeb19eff3e5dd5 Mon Sep 17 00:00:00 2001
-From: Carl Eugen Hoyos <cehoyos at ag.or.at>
-Date: Sun, 1 May 2016 15:39:13 +0200
-Subject: [PATCH 1/2] lavf/mpegts: Return small probe score for very short
- transport streams.
-
-Fixes Debian bug 823098.
-
-(cherry picked from commit 88a849c714c17ad80d411f68e6575dfa1c8e8358)
----
- libavformat/mpegts.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index 22874e6..87a21f0 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -2441,7 +2441,7 @@ static int mpegts_probe(AVProbeData *p)
- #define CHECK_COUNT 10
- #define CHECK_BLOCK 100
- 
--    if (check_count < CHECK_COUNT)
-+    if (!check_count)
-         return 0;
- 
-     for (i = 0; i<check_count; i+=CHECK_BLOCK) {
-@@ -2459,10 +2459,15 @@ static int mpegts_probe(AVProbeData *p)
- 
-     ff_dlog(0, "TS score: %d %d\n", sumscore, maxscore);
- 
--    if      (sumscore > 6) return AVPROBE_SCORE_MAX   + sumscore - CHECK_COUNT;
--    else if (maxscore > 6) return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT;
--    else
-+    if        (check_count >= CHECK_COUNT && sumscore > 6) {
-+        return AVPROBE_SCORE_MAX   + sumscore - CHECK_COUNT;
-+    } else if (check_count >= CHECK_COUNT && maxscore > 6) {
-+        return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT;
-+    } else if (sumscore > 6) {
-+        return 2;
-+    } else {
-         return 0;
-+    }
- }
- 
- /* return the 90kHz PCR and the extension for the 27MHz PCR. return
--- 
-2.8.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3aa9fb2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-lavf-mpegts-Return-small-probe-score-for-very-short-.patch

-- 
ffmpeg packaging