summaryrefslogtreecommitdiff
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c14
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;
}