]> git.sesse.net Git - ffmpeg/commitdiff
udp: fix occasional crash on shutdown
authorEric Petit <eric@lapsus.org>
Wed, 27 Jun 2012 13:09:40 +0000 (15:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Jun 2012 20:50:22 +0000 (22:50 +0200)
Wait until the thread is down before destroying the fifo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/udp.c

index e8493b5df2970bf92b27aa2c23f6f7d952982813..396cf85ea021e515d165ef74ec0041869de1b35a 100644 (file)
@@ -656,7 +656,6 @@ static int udp_close(URLContext *h)
     if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
         udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
     closesocket(s->udp_fd);
-    av_fifo_free(s->fifo);
 #if HAVE_PTHREAD_CANCEL
     if (s->thread_started) {
         pthread_cancel(s->circular_buffer_thread);
@@ -668,6 +667,7 @@ static int udp_close(URLContext *h)
     pthread_mutex_destroy(&s->mutex);
     pthread_cond_destroy(&s->cond);
 #endif
+    av_fifo_free(s->fifo);
     return 0;
 }