aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-12 01:04:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-12 01:05:10 +0100
commit12aab852c58d15efeea6d190b0fb1368ea45b501 (patch)
treeaef6ade04b479f5d46346fdc7d6dcc1f44560b00
parent597d826123dc5fd1eb00ad1b84c7d1e1f6d8e346 (diff)
parenteaf4ab9802d5ad82a707514cae165c6db9e7bfc8 (diff)
downloadffmpeg-12aab852c58d15efeea6d190b0fb1368ea45b501.tar.gz
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: signal the frame queue before closing audio Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index 490bffa8b1..f79161dd00 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);