highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udp: do not call pthread_{mutex,cond}_destroy when not initialized.

Browse Source 
This seems to cause a crash on Windows.

The author of that patch was a random guy on IRC who wants to stay anonymous.
This commit is contained in:
anonymous 2012-08-06 09:56:50 +02:00 committed by Clément Bœsch
parent e6b9903d82
commit 388243bb27
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/udp.c
View File

@ -786,10 +786,9 @@ static int udp_close(URLContext *h)
ret = pthread_join(s->circular_buffer_thread, NULL); ret = pthread_join(s->circular_buffer_thread, NULL);
if (ret != 0) if (ret != 0)
av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret)); 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 #endif
av_fifo_free(s->fifo); av_fifo_free(s->fifo);
return 0; return 0;