[FFmpeg-cvslog] ffplay: signal the frame queue before closing audio

Marton Balint git at videolan.org
Wed Nov 12 01:05:30 CET 2014


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Nov 10 23:23:47 2014 +0100| [eaf4ab9802d5ad82a707514cae165c6db9e7bfc8] | committer: Marton Balint

ffplay: signal the frame queue before closing audio

Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 ffplay.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 490bffa..f79161d 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2786,9 +2786,8 @@ static void stream_component_close(VideoState *is, int stream_index)
     switch (avctx->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
         packet_queue_abort(&is->audioq);
-
-        SDL_CloseAudio();
         frame_queue_signal(&is->sampq);
+        SDL_CloseAudio();
         SDL_WaitThread(is->audio_tid, NULL);
 
         decoder_destroy(&is->auddec);



More information about the ffmpeg-cvslog mailing list