eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename thread_init() in libavcodec and libavfilter as library_thread_init().

Browse source 
The aix header sys/thread.h contains a definition for thread_init().
This commit is contained in:
Carl Eugen Hoyos 2013-06-30 13:34:46 +02:00
parent 33f5d70df5
commit 674d8a9629
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/pthread.c
View file

@ -249,7 +249,7 @@ static int avcodec_thread_execute2(AVCodecContext *avctx, action_func2* func2, v
return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0);
}
static int thread_init(AVCodecContext *avctx)
static int avcodec_thread_init(AVCodecContext *avctx)
{
int i;
ThreadContext *c;
@ -1103,7 +1103,7 @@ int ff_thread_init(AVCodecContext *avctx)
validate_thread_parameters(avctx);
if (avctx->active_thread_type&FF_THREAD_SLICE)
return thread_init(avctx);
return avcodec_thread_init(avctx);
else if (avctx->active_thread_type&FF_THREAD_FRAME)
return frame_thread_init(avctx);