[SCM] ffmpeg/master: Drop avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch included upstream.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 527d963d4744cecff28102f8a2ebb1cf33f55fac
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Thu Nov 12 22:40:12 2015 +0100

    Drop avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch included upstream.

diff --git a/debian/patches/avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch b/debian/patches/avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch
deleted file mode 100644
index e262862..0000000
--- a/debian/patches/avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b46efcb2933c6adc11486104195dcd5054485246 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael at niedermayer.cc>
-Date: Wed, 30 Sep 2015 13:10:48 +0200
-Subject: [PATCH] avcodec/vp8: Do not use num_coeff_partitions in thread/buffer
- setup
-
-The variable is not a constant and can lead to race conditions
-
-Fixes: repro.webm (not reproducable with FFmpeg alone)
-
-Found-by: Dale Curtis <dalecurtis at google.com>
-Tested-by: Dale Curtis <dalecurtis at google.com>
-Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
-(cherry picked from commit dabea74d0e82ea80cd344f630497cafcb3ef872c)
----
- libavcodec/vp8.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
-index 730871a..cb0c7cd 100644
---- a/libavcodec/vp8.c
-+++ b/libavcodec/vp8.c
-@@ -164,7 +164,7 @@ int update_dimensions(VP8Context *s, int width, int height, int is_vp7)
-     s->mb_height = (s->avctx->coded_height + 15) / 16;
- 
-     s->mb_layout = is_vp7 || avctx->active_thread_type == FF_THREAD_SLICE &&
--                   FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1;
-+                   avctx->thread_count > 1;
-     if (!s->mb_layout) { // Frame threading and one thread
-         s->macroblocks_base       = av_mallocz((s->mb_width + s->mb_height * 2 + 1) *
-                                                sizeof(*s->macroblocks));
--- 
-2.6.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 2eeae7b..0783efa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 Change-symbol-versioning.patch
-avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch

-- 
ffmpeg packaging