Get rid of more senseless wrapper functions and use OPT_EXIT instead.

Originally committed as revision 13233 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 14 deletions

diff --git a/ffplay.c b/ffplay.c
index 02d0dc4632..54b6e41c83 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2432,21 +2432,9 @@ static int opt_thread_count(const char *opt, const char *arg)
     return 0;
 }
 
-static void opt_show_help(void)
-{
-    show_help();
-    exit(0);
-}
-
-static void opt_show_version(void)
-{
-    show_version();
-    exit(0);
-}
-
 static const OptionDef options[] = {
-    { "h", 0, {(void*)opt_show_help}, "show help" },
-    { "version", 0, {(void*)opt_show_version}, "show version" },
+    { "h", OPT_EXIT, {(void*)show_help}, "show help" },
+    { "version", OPT_EXIT, {(void*)show_version}, "show version" },
     { "x", HAS_ARG | OPT_FUNC2, {(void*)opt_width}, "force displayed width", "width" },
     { "y", HAS_ARG | OPT_FUNC2, {(void*)opt_height}, "force displayed height", "height" },
     { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },