# HG changeset patch # User benoit # Date 1268661781 0 # Node ID 7bfe7456e3726130bb969f6c989e42998588a034 # Parent 63837bcce8408a40ac57db90be46fedb470b2806 Remove avcodec_thread_execute from avcodec.h, and make static functions that need it in *thread.c. diff -r 63837bcce840 -r 7bfe7456e372 avcodec.h --- a/avcodec.h Sun Mar 14 23:52:45 2010 +0000 +++ b/avcodec.h Mon Mar 15 14:03:01 2010 +0000 @@ -3256,7 +3256,6 @@ 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 -r 63837bcce840 -r 7bfe7456e372 beosthread.c --- a/beosthread.c Sun Mar 14 23:52:45 2010 +0000 +++ b/beosthread.c Mon Mar 15 14:03:01 2010 +0000 @@ -92,7 +92,7 @@ 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 -r 63837bcce840 -r 7bfe7456e372 os2thread.c --- a/os2thread.c Sun Mar 14 23:52:45 2010 +0000 +++ b/os2thread.c Mon Mar 15 14:03:01 2010 +0000 @@ -39,7 +39,7 @@ }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 @@ 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 -r 63837bcce840 -r 7bfe7456e372 pthread.c --- a/pthread.c Sun Mar 14 23:52:45 2010 +0000 +++ b/pthread.c Mon Mar 15 14:03:01 2010 +0000 @@ -104,7 +104,7 @@ 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 -r 63837bcce840 -r 7bfe7456e372 w32thread.c --- a/w32thread.c Sun Mar 14 23:52:45 2010 +0000 +++ b/w32thread.c Mon Mar 15 14:03:01 2010 +0000 @@ -93,7 +93,7 @@ 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;