diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-26 13:55:30 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-28 23:07:52 +0200 |
| commit | 46027c7286144294dee565946dccb59f1a8dfeca (patch) | |
| tree | a4bd06202a3882ae15b59c252c75f0b39ced2283 /libavcodec/w32thread.c | |
| parent | 95c8bb03edf5d5c7310947819c4c8691a5e3dfb0 (diff) | |
| download | ffmpeg-46027c7286144294dee565946dccb59f1a8dfeca.tar.gz | |
Unbreak avcodec_thread_init
avcodec_thread_init currently doesn't do anything at all with pthreads enabled.
Diffstat (limited to 'libavcodec/w32thread.c')
| -rw-r--r-- | libavcodec/w32thread.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c index f2b8f5b365..f905077015 100644 --- a/libavcodec/w32thread.c +++ b/libavcodec/w32thread.c @@ -125,7 +125,7 @@ static int avcodec_thread_execute2(AVCodecContext *s, int (*func)(AVCodecContext avcodec_thread_execute(s, NULL, arg, ret, count, 0); } -int ff_thread_init(AVCodecContext *s, int thread_count){ +int ff_thread_init(AVCodecContext *s){ int i; ThreadContext *c; uint32_t threadid; @@ -135,7 +135,6 @@ int ff_thread_init(AVCodecContext *s, int thread_count){ return 0; } - s->thread_count= thread_count; s->active_thread_type= FF_THREAD_SLICE; if (thread_count <= 1) |