[SCM] ffmpeg/master: Upstream patch to fix #823098

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 419283cc9d4bb474d5ecad3cc85f4f923c4a367f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 8 19:52:02 2016 +0200

    Upstream patch to fix #823098

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
new file mode 100644
index 0000000..6873c1a
--- /dev/null
+++ b/debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 0000000..3aa9fb2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lavf-mpegts-Return-small-probe-score-for-very-short-.patch

-- 
ffmpeg packaging