diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 01:04:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 01:05:10 +0100 |
commit | 12aab852c58d15efeea6d190b0fb1368ea45b501 (patch) | |
tree | aef6ade04b479f5d46346fdc7d6dcc1f44560b00 | |
parent | 597d826123dc5fd1eb00ad1b84c7d1e1f6d8e346 (diff) | |
parent | eaf4ab9802d5ad82a707514cae165c6db9e7bfc8 (diff) | |
download | ffmpeg-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.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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); |