Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: signal the frame queue before closing audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/95/head
Michael Niedermayer 10 years ago
commit 12aab852c5
  1. 3
      ffplay.c

@ -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);

Loading…
Cancel
Save