aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-12-15 21:02:17 +0000
committerDiego Biurrun <diego@biurrun.de>2008-12-15 21:02:17 +0000
commitc4687bf60754e8156ce647519cba8d943e606eda (patch)
tree07b343a13aa3efddb7f0089165b9cb83c76d8fc3
parent40a19c443430de520d86bbd644033c8e2ca87e9b (diff)
downloadffmpeg-c4687bf60754e8156ce647519cba8d943e606eda.tar.gz
Avoid invasion of POSIX-reserved _t namespace.
Originally committed as revision 16144 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/pthread.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 71f2da630f..e178993ee9 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -25,11 +25,11 @@
#include "avcodec.h"
-typedef int (action_t)(AVCodecContext *c, void *arg);
+typedef int (action_func)(AVCodecContext *c, void *arg);
typedef struct ThreadContext {
pthread_t *workers;
- action_t *func;
+ action_func *func;
void *args;
int *rets;
int rets_count;
@@ -101,7 +101,7 @@ void avcodec_thread_free(AVCodecContext *avctx)
av_freep(&avctx->thread_opaque);
}
-int avcodec_thread_execute(AVCodecContext *avctx, action_t* func, void *arg, int *ret, int job_count, int job_size)
+int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
{
ThreadContext *c= avctx->thread_opaque;
int dummy_ret;