highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffplay: signal the frame queue before closing audio

Browse Source 
Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2014-11-10 23:23:47 +01:00
parent 2813dabdd4
commit eaf4ab9802
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffplay.c
View File

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