diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-19 20:29:26 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-19 20:29:26 +0000 |
commit | 16806499fc13ec0a7664186a42a48d9154b2a8a3 (patch) | |
tree | cab4ff221574eacb06f70720f21124da312f4c59 /libavcodec/pthread.c | |
parent | 530d574081ee03a8bbcb408053b90155ad58a9e0 (diff) | |
download | ffmpeg-16806499fc13ec0a7664186a42a48d9154b2a8a3.tar.gz |
w32threads by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2803 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r-- | libavcodec/pthread.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 6f98dc41f4..770f9a54dd 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -54,10 +54,10 @@ static void * thread_func(void *v){ } /** - * free what has been allocated by avcodec_pthread_init(). - * must be called after decoding has finished, especially dont call while avcodec_pthread_execute() is running + * free what has been allocated by avcodec_thread_init(). + * must be called after decoding has finished, especially dont call while avcodec_thread_execute() is running */ -void avcodec_pthread_free(AVCodecContext *s){ +void avcodec_thread_free(AVCodecContext *s){ ThreadContext *c= s->thread_opaque; int i; @@ -77,7 +77,7 @@ void avcodec_pthread_free(AVCodecContext *s){ av_freep(&s->thread_opaque); } -int avcodec_pthread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){ +int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){ ThreadContext *c= s->thread_opaque; int i, val; @@ -107,7 +107,7 @@ int avcodec_pthread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, v return 0; } -int avcodec_pthread_init(AVCodecContext *s, int thread_count){ +int avcodec_thread_init(AVCodecContext *s, int thread_count){ int i; ThreadContext *c; @@ -130,10 +130,10 @@ int avcodec_pthread_init(AVCodecContext *s, int thread_count){ } //printf("init done\n"); fflush(stdout); - s->execute= avcodec_pthread_execute; + s->execute= avcodec_thread_execute; return 0; fail: - avcodec_pthread_free(s); + avcodec_thread_free(s); return -1; } |