diff options
| author | Sean McGovern <gseanmcg@gmail.com> | 2013-07-16 11:31:23 -0400 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-07-17 00:13:31 +0300 |
| commit | 50612484e058e8b241f0528584d64d9d2ccebf12 (patch) | |
| tree | f8786c092917bd30e953fd2c7ce2e35f5af33b3e /libavcodec/pthread.c | |
| parent | e740929a071ab032ffa382e89da69c6ec7cf882c (diff) | |
pthread: Rename thread_init to avoid symbol collision
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 1523353580..a4e48d329d 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -234,7 +234,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 thread_init_internal(AVCodecContext *avctx) { int i; ThreadContext *c; @@ -1000,7 +1000,7 @@ int ff_thread_init(AVCodecContext *avctx) validate_thread_parameters(avctx); if (avctx->active_thread_type&FF_THREAD_SLICE) - return thread_init(avctx); + return thread_init_internal(avctx); else if (avctx->active_thread_type&FF_THREAD_FRAME) return frame_thread_init(avctx); |