aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2012-05-22 00:10:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-27 16:12:02 +0200
commitc7c82acf96e2908d375ed433e096c894faf87aac (patch)
treef12b6751d537ee93403cf86f363ca75938045e67
parentf8f5db3b700edefdd3a04b05592ab1dde4757ee2 (diff)
downloadffmpeg-c7c82acf96e2908d375ed433e096c894faf87aac.tar.gz
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@passwd.hu> (cherry picked from commit 7315e40a24e85e7f141db77951a4b14375fde55a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 40647ac977..6352f83bf1 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