[FFmpeg-cvslog] udp: do not call pthread_{mutex, cond}_destroy when not initialized.

anonymous git at videolan.org
Mon Aug 6 10:06:41 CEST 2012


ffmpeg | branch: master | anonymous <anonymous> | Mon Aug  6 09:56:50 2012 +0200| [388243bb27f3d9b8f50d54268a784d55a7171f10] | committer: Clément Bœsch

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=388243bb27f3d9b8f50d54268a784d55a7171f10
---

 libavformat/udp.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index bd7665e..f93c607 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;



More information about the ffmpeg-cvslog mailing list