[FFmpeg-cvslog] ffplay: force exit when filter configuration fails
Marton Balint
git at videolan.org
Sun May 27 17:32:05 CEST 2012
ffmpeg | branch: release/0.11 | Marton Balint <cus at passwd.hu> | Tue May 22 00:10:03 2012 +0200| [c7c82acf96e2908d375ed433e096c894faf87aac] | committer: Michael Niedermayer
ffplay: force exit when filter configuration fails
Switching to visualization instead of exiting ffplay is a bit more tricky, so
just exit for now.
Fixes ticket 38.
Signed-off-by: Marton Balint <cus at passwd.hu>
(cherry picked from commit 7315e40a24e85e7f141db77951a4b14375fde55a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7c82acf96e2908d375ed433e096c894faf87aac
---
ffplay.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ffplay.c b/ffplay.c
index 40647ac..6352f83 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1838,8 +1838,13 @@ static int video_thread(void *arg)
int last_w = is->video_st->codec->width;
int last_h = is->video_st->codec->height;
- if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
+ if ((ret = configure_video_filters(graph, is, vfilters)) < 0) {
+ SDL_Event event;
+ event.type = FF_QUIT_EVENT;
+ event.user.data1 = is;
+ SDL_PushEvent(&event);
goto the_end;
+ }
filt_out = is->out_video_filter;
#endif
More information about the ffmpeg-cvslog
mailing list