[FFmpeg-cvslog] ffplay: fix autoexit doesn't work in the case of pb->error
Zhao Zhili
git at videolan.org
Tue Sep 8 21:03:21 EEST 2020
ffmpeg | branch: master | Zhao Zhili <quinkblack at foxmail.com> | Thu Aug 27 00:44:56 2020 +0800| [99e12b5736bd4a63186a4fc71b69ca3ec0c9fa34] | committer: Marton Balint
ffplay: fix autoexit doesn't work in the case of pb->error
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99e12b5736bd4a63186a4fc71b69ca3ec0c9fa34
---
fftools/ffplay.c | 8 ++++++--
1 file 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);
More information about the ffmpeg-cvslog
mailing list