Commit 12aab852 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: signal the frame queue before closing audio
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 597d8261 eaf4ab98
...@@ -2786,9 +2786,8 @@ static void stream_component_close(VideoState *is, int stream_index) ...@@ -2786,9 +2786,8 @@ static void stream_component_close(VideoState *is, int stream_index)
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
packet_queue_abort(&is->audioq); packet_queue_abort(&is->audioq);
SDL_CloseAudio();
frame_queue_signal(&is->sampq); frame_queue_signal(&is->sampq);
SDL_CloseAudio();
SDL_WaitThread(is->audio_tid, NULL); SDL_WaitThread(is->audio_tid, NULL);
decoder_destroy(&is->auddec); decoder_destroy(&is->auddec);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment