---
libavcodec/pthread.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 5cd66e3..455ac8e 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -138,7 +138,7 @@ static av_always_inline void avcodec_thread_park_workers(ThreadContext *c, int t
pthread_mutex_unlock(&c->current_job_lock);
}
-static void ff_thread_free(AVCodecContext *avctx)
+static void thread_free(AVCodecContext *avctx)
{
ThreadContext *c = avctx->thread_opaque;
int i;
@@ -189,7 +189,7 @@ int avcodec_thread_execute(AVCodecContext *avctx, action_t* func, void **arg, in
return 0;
}
-static int ff_thread_init(AVCodecContext *avctx, int thread_count)
+static int thread_init(AVCodecContext *avctx, int thread_count)
{
int i;
ThreadContext *c;
@@ -271,7 +271,7 @@ static attribute_align_arg void *decode_frame_thread(void *arg)
return NULL;
}
-static int ff_frame_thread_init(AVCodecContext *avctx)
+static int frame_thread_init(AVCodecContext *avctx)
{
FrameThreadContext *fctx;
AVCodecContext *src = avctx;
@@ -442,7 +442,7 @@ int ff_decode_frame_threaded(AVCodecContext *avctx,
PerThreadContext * volatile p;
int thread_count = avctx->thread_count, err = 0;
- if (!avctx->thread_opaque) ff_frame_thread_init(avctx);
+ if (!avctx->thread_opaque) frame_thread_init(avctx);
fctx = avctx->thread_opaque;
p = &fctx->threads[fctx->next_available];
@@ -531,7 +531,7 @@ static void park_frame_decode_threads(FrameThreadContext *fctx, int thread_count
}
}
-static void ff_frame_thread_free(AVCodecContext *avctx)
+static void frame_thread_free(AVCodecContext *avctx)
{
FrameThreadContext *fctx = avctx->thread_opaque;
AVCodec *codec = avctx->codec;
@@ -651,7 +651,7 @@ void ff_release_buffer(AVCodecContext *avctx, AVFrame *f)
}
/// Set the threading algorithm used, or none if an algorithm was set but no thread count.
-static void ff_validate_thread_parameters(AVCodecContext *avctx)
+static void validate_thread_parameters(AVCodecContext *avctx)
{
int frame_threading_supported = (avctx->codec->capabilities & CODEC_CAP_FRAME_THREADS)
&& !(avctx->flags & CODEC_FLAG_TRUNCATED)
@@ -670,11 +670,11 @@ int avcodec_thread_init(AVCodecContext *avctx, int thread_count)
avctx->thread_count = thread_count;
if (avctx->codec) {
- ff_validate_thread_parameters(avctx);
+ validate_thread_parameters(avctx);
// frame_thread_init must be called after codec init
if (USE_AVCODEC_EXECUTE(avctx))
- return ff_thread_init(avctx, thread_count);
+ return thread_init(avctx, thread_count);
}
return 0;
@@ -683,7 +683,7 @@ int avcodec_thread_init(AVCodecContext *avctx, int thread_count)
void avcodec_thread_free(AVCodecContext *avctx)
{
if (USE_FRAME_THREADING(avctx))
- ff_frame_thread_free(avctx);
+ frame_thread_free(avctx);
else
- ff_thread_free(avctx);
+ thread_free(avctx);
}
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc