Mercurial > libavcodec.hg

changeset 11492:7bfe7456e372 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove avcodec_thread_execute from avcodec.h, and make static functions that need it in *thread.c.
author benoit
date Mon, 15 Mar 2010 14:03:01 +0000
parents 63837bcce840
children 495095fb615b
files avcodec.h beosthread.c os2thread.c pthread.c w32thread.c
diffstat 5 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 
--- 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;
 
--- 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;
--- 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;