[SCM] ffmpeg/master: remove readd_avcodec_thread_init.patch, applied upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 940dc00154d6f292ef2231d58ad054563692aa4e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:19:11 2011 +0200

    remove readd_avcodec_thread_init.patch, applied upstream

diff --git a/debian/patches/readd_avcodec_thread_init.patch b/debian/patches/readd_avcodec_thread_init.patch
deleted file mode 100644
index 547bdc4..0000000
--- a/debian/patches/readd_avcodec_thread_init.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Anton Khirnov <anton at khirnov.net>
-Date: Wed, 20 Apr 2011 15:21:39 +0000 (+0200)
-Subject: lavc: provide deprecated avcodec_thread_init until next major version
-X-Git-Url: http://git.libav.org/?p=libav.git;a=commitdiff_plain;h=65af48b55930abe5ac9130be3ff4d9c287a7f010
-
-lavc: provide deprecated avcodec_thread_init until next major version
-
-It was deprecated only recently.
----
-
---- a/libavcodec/utils.c
-+++ b/libavcodec/utils.c
-@@ -1287,7 +1287,7 @@ void ff_thread_await_progress(AVFrame *f
- 
- #endif
- 
--#if LIBAVCODEC_VERSION_MAJOR < 53
-+#if FF_API_THREAD_INIT
- 
- int avcodec_thread_init(AVCodecContext *s, int thread_count)
- {
---- a/libavcodec/version.h
-+++ b/libavcodec/version.h
-@@ -86,5 +86,8 @@
- #ifndef FF_API_REQUEST_CHANNELS
- #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
- #endif
-+#ifndef FF_API_THREAD_INIT
-+#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
-+#endif
- 
- #endif /* AVCODEC_VERSION_H */
---- a/libavcodec/avcodec.h
-+++ b/libavcodec/avcodec.h
-@@ -3684,7 +3684,7 @@ int avcodec_check_dimensions(void *av_lo
- 
- enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
- 
--#if LIBAVCODEC_VERSION_MAJOR < 53
-+#if FF_API_THREAD_INIT
- /**
-  * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this.
-  */
diff --git a/debian/patches/series b/debian/patches/series
index 6735f45..3949993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-Tweak-doxygen-config.patch
-readd_avcodec_thread_init.patch

-- 
Libav/FFmpeg packaging