aboutsummaryrefslogtreecommitdiffstats
path: root/fftools
diff options
context:
space:
mode:
authorZhao Zhili <quinkblack@foxmail.com>2020-08-27 00:44:56 +0800
committerMarton Balint <cus@passwd.hu>2020-09-08 19:59:17 +0200
commit99e12b5736bd4a63186a4fc71b69ca3ec0c9fa34 (patch)
tree95c06d002159fccf1bd4ae04e97046fda0a5ead9 /fftools
parentd1f3d721df32680e9904f3c5b2c666eb5830c89a (diff)
downloadffmpeg-99e12b5736bd4a63186a4fc71b69ca3ec0c9fa34.tar.gz
ffplay: fix autoexit doesn't work in the case of pb->error
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'fftools')
-rw-r--r--fftools/ffplay.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 6c9c041e9a..9ff0425163 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -3028,8 +3028,12 @@ static int read_thread(void *arg)
packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream);
is->eof = 1;
}
- if (ic->pb && ic->pb->error)
- break;
+ if (ic->pb && ic->pb->error) {
+ if (autoexit)
+ goto fail;
+ else
+ break;
+ }
SDL_LockMutex(wait_mutex);
SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10);
SDL_UnlockMutex(wait_mutex);