virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

pthread: next try on freeing threads without crashing.

Browse Source 
This should fix mingw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-27 05:55:20 +01:00
parent 3d977edb04
commit 2bb79b23fe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pthread.c
View File

@ -72,6 +72,7 @@ typedef struct PerThreadContext {
struct FrameThreadContext *parent;
pthread_t thread;
int thread_created;
pthread_cond_t input_cond; ///< Used to wait for a new packet from the main thread.
pthread_cond_t progress_cond; ///< Used by child threads to wait for progress to change.
pthread_cond_t output_cond; ///< Used by the main thread to wait for frames to finish.
@ -658,8 +659,9 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count)
pthread_cond_signal(&p->input_cond);
pthread_mutex_unlock(&p->mutex);
if (p->thread)
if (p->thread_created)
pthread_join(p->thread, NULL);
p->thread_created=0;
if (codec->close)
codec->close(p->avctx);
@ -763,7 +765,7 @@ static int frame_thread_init(AVCodecContext *avctx)
if (err) goto error;
pthread_create(&p->thread, NULL, frame_worker_thread, p);
p->thread_created= !pthread_create(&p->thread, NULL, frame_worker_thread, p);
}
return 0;