From 388243bb27f3d9b8f50d54268a784d55a7171f10 Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 6 Aug 2012 09:56:50 +0200 Subject: udp: do not call pthread_{mutex,cond}_destroy when not initialized. This seems to cause a crash on Windows. The author of that patch was a random guy on IRC who wants to stay anonymous. --- libavformat/udp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index bd7665ef74..f93c607c35 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -786,10 +786,9 @@ static int udp_close(URLContext *h) ret = pthread_join(s->circular_buffer_thread, NULL); if (ret != 0) av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret)); + pthread_mutex_destroy(&s->mutex); + pthread_cond_destroy(&s->cond); } - - pthread_mutex_destroy(&s->mutex); - pthread_cond_destroy(&s->cond); #endif av_fifo_free(s->fifo); return 0; -- cgit v1.2.3