1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-01 22:16:42 +02:00

Merge remote-tracking branch 'cus/stable'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-12 01:04:46 +01:00
commit 12aab852c5

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