FreeBSD support as well as some assorted fixes

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index a6d5e7a3bb5bef53338f3b72f5c5f1153e625bd0..d9c66f015e20a8d54f4cd0887bc96add196c8484 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -8,16 +8,25 @@ typedef struct {
 #define OPT_BOOL   0x0002
 #define OPT_EXPERT 0x0004
 #define OPT_STRING 0x0008
-    union {
-        void (*func_arg)(const char *);
+#define OPT_VIDEO  0x0010
+#define OPT_AUDIO  0x0020
+#define OPT_GRAB   0x0040
+#define OPT_INT    0x0080
+#define OPT_FLOAT  0x0100
+#define OPT_SUBTITLE 0x0200
+#define OPT_FUNC2  0x0400
+     union {
+        void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func
         int *int_arg;
         char **str_arg;
+        float *float_arg;
+        int (*func2_arg)(const char *, const char *);
     } u;
     const char *help;
     const char *argname;
 } OptionDef;
 
-void show_help_options(const OptionDef *options);
+void show_help_options(const OptionDef *options, const char *msg, int mask, int value);
 void parse_options(int argc, char **argv, const OptionDef *options);
 void parse_arg_file(const char *filename);
 void print_error(const char *filename, int err);