Browse Source

Merge remote-tracking branch 'cus/stable'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
commit
12aab852c5
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      ffplay.c

+ 1
- 2
ffplay.c View File

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


Loading…
Cancel
Save