From 4a287145c2838aaef61c927fd5311fff643845ef Mon Sep 17 00:00:00 2001
From: Benoit Fouet <benoit.fouet@free.fr>
Date: Mon, 15 Mar 2010 14:03:01 +0000
Subject: [PATCH] Remove avcodec_thread_execute from avcodec.h, and make static
 functions that need it in *thread.c.

Originally committed as revision 22544 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/avcodec.h    | 1 -
 libavcodec/beosthread.c | 2 +-
 libavcodec/os2thread.c  | 4 ++--
 libavcodec/pthread.c    | 2 +-
 libavcodec/w32thread.c  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d57f883a73..43a0695508 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3256,7 +3256,6 @@ enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum
 
 int avcodec_thread_init(AVCodecContext *s, int thread_count);
 void avcodec_thread_free(AVCodecContext *s);
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
 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/beosthread.c b/libavcodec/beosthread.c
index 290e48c93f..44fe492c4b 100644
--- a/libavcodec/beosthread.c
+++ b/libavcodec/beosthread.c
@@ -92,7 +92,7 @@ void avcodec_thread_free(AVCodecContext *s){
     av_freep(&s->thread_opaque);
 }
 
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
+static int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
     ThreadContext *c= s->thread_opaque;
     int i;
 
diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c
index 76dc0d56bc..3d1367c8f4 100644
--- a/libavcodec/os2thread.c
+++ b/libavcodec/os2thread.c
@@ -39,7 +39,7 @@ typedef struct ThreadContext{
 }ThreadContext;
 
 
-void attribute_align_arg thread_func(void *v){
+static void attribute_align_arg thread_func(void *v){
     ThreadContext *c= v;
 
     for(;;){
@@ -81,7 +81,7 @@ void avcodec_thread_free(AVCodecContext *s){
     av_freep(&s->thread_opaque);
 }
 
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
+static int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
     ThreadContext *c= s->thread_opaque;
     int i;
 
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index b642d3e2e3..1628b21a1f 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -104,7 +104,7 @@ void avcodec_thread_free(AVCodecContext *avctx)
     av_freep(&avctx->thread_opaque);
 }
 
-int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
+static int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
 {
     ThreadContext *c= avctx->thread_opaque;
     int dummy_ret;
diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index e3fb372922..f7a1430647 100644
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -93,7 +93,7 @@ void avcodec_thread_free(AVCodecContext *s){
     av_freep(&s->thread_opaque);
 }
 
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
+static int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
     ThreadContext *c= s->thread_opaque;
     int i;
     int jobnr = 0;