virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove avcodec_thread_execute from avcodec.h, and make static functions that

Browse Source 
need it in *thread.c.

Originally committed as revision 22544 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benoit Fouet 2010-03-15 14:03:01 +00:00
parent b1d55e5e4f
commit 4a287145c2
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/avcodec.h
View File

@ -3256,7 +3256,6 @@ enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum
int avcodec_thread_init(AVCodecContext *s, int thread_count); int avcodec_thread_init(AVCodecContext *s, int thread_count);
void avcodec_thread_free(AVCodecContext *s); 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_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); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
//FIXME func typedef //FIXME func typedef

2
libavcodec/beosthread.c
View File

@ -92,7 +92,7 @@ void avcodec_thread_free(AVCodecContext *s){
av_freep(&s->thread_opaque); 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; ThreadContext *c= s->thread_opaque;
int i; int i;

4
libavcodec/os2thread.c
View File

@ -39,7 +39,7 @@ typedef struct ThreadContext{
}ThreadContext; }ThreadContext;
void attribute_align_arg thread_func(void *v){ static void attribute_align_arg thread_func(void *v){
ThreadContext *c= v; ThreadContext *c= v;
for(;;){ for(;;){
@ -81,7 +81,7 @@ void avcodec_thread_free(AVCodecContext *s){
av_freep(&s->thread_opaque); 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; ThreadContext *c= s->thread_opaque;
int i; int i;

2
libavcodec/pthread.c
View File

@ -104,7 +104,7 @@ void avcodec_thread_free(AVCodecContext *avctx)
av_freep(&avctx->thread_opaque); 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; ThreadContext *c= avctx->thread_opaque;
int dummy_ret; int dummy_ret;

2
libavcodec/w32thread.c
View File

@ -93,7 +93,7 @@ void avcodec_thread_free(AVCodecContext *s){
av_freep(&s->thread_opaque); 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; ThreadContext *c= s->thread_opaque;
int i; int i;
int jobnr = 0; int jobnr = 0;