[SCM] ffmpeg/master: update debian/patches/readd_avcodec_thread_init.patch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 27c07728052d137ceb7fea1011060575abb9d12d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 19:05:40 2011 +0200

    update debian/patches/readd_avcodec_thread_init.patch

diff --git a/debian/patches/readd_avcodec_thread_init.patch b/debian/patches/readd_avcodec_thread_init.patch
index f6ca874..547bdc4 100644
--- a/debian/patches/readd_avcodec_thread_init.patch
+++ b/debian/patches/readd_avcodec_thread_init.patch
@@ -8,51 +8,36 @@ lavc: provide deprecated avcodec_thread_init until next major version
 It was deprecated only recently.
 ---
 
-diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-index 40d3b22..7727ad0 100644
---- a/libavcodec/avcodec.h
-+++ b/libavcodec/avcodec.h
-@@ -3577,6 +3577,14 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
- 
- enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
- 
-+#if FF_API_THREAD_INIT
-+/**
-+ * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this.
-+ */
-+attribute_deprecated
-+int avcodec_thread_init(AVCodecContext *s, int thread_count);
-+#endif
-+
- int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
- int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
- //FIXME func typedef
-diff --git a/libavcodec/utils.c b/libavcodec/utils.c
-index 0190e66..744e0ad 100644
 --- a/libavcodec/utils.c
 +++ b/libavcodec/utils.c
-@@ -1220,3 +1220,11 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
- }
+@@ -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)
-+{
-+    s->thread_count = thread_count;
-+    return ff_thread_init(s);
-+}
-+#endif
-diff --git a/libavcodec/version.h b/libavcodec/version.h
-index 92f9e58..b9c219d 100644
+ 
+ int avcodec_thread_init(AVCodecContext *s, int thread_count)
+ {
 --- a/libavcodec/version.h
 +++ b/libavcodec/version.h
-@@ -65,5 +65,8 @@
- #ifndef FF_API_OPT_H
- #define FF_API_OPT_H            (LIBAVCODEC_VERSION_MAJOR < 54)
+@@ -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.
+  */

-- 
Libav/FFmpeg packaging