generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate avcodec_thread_init()

Browse Source 
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Alexander Strange
2011-02-07 21:15:45 -05:00
committed by Ronald S. Bultje
parent 8e8cc52be3
commit c0b102ca03
8 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pthread.c
View File

@@ -256,7 +256,7 @@ static int thread_init(AVCodecContext *avctx)
if(pthread_create(&c->workers[i], NULL, worker, avctx)) {
avctx->thread_count = i;
pthread_mutex_unlock(&c->current_job_lock);
avcodec_thread_free(avctx);
ff_thread_free(avctx);
return -1;
}
}
@@ -870,7 +870,7 @@ static void validate_thread_parameters(AVCodecContext *avctx)
}
}
int avcodec_thread_init(AVCodecContext *avctx, int thread_count)
int ff_thread_init(AVCodecContext *avctx, int thread_count)
{
if (avctx->thread_opaque) {
av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n");
@@ -891,7 +891,7 @@ int avcodec_thread_init(AVCodecContext *avctx, int thread_count)
return 0;
}
void avcodec_thread_free(AVCodecContext *avctx)
void ff_thread_free(AVCodecContext *avctx)
{
if (avctx->active_thread_type&FF_THREAD_FRAME)
frame_thread_free(avctx, avctx->thread_count);