aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-05-27 22:21:40 +0300
committerMartin Storsjö <martin@martin.st>2011-06-10 10:47:42 +0300
commitcb7c11cc9e7e05c819fff487a3f486f11ab4b860 (patch)
tree33df04b40062ce5cb443b9b24cc3b1feb75bff8f /libavutil
parent0558e266a267b5d90d3be1d8d86e60db2c303773 (diff)
downloadffmpeg-cb7c11cc9e7e05c819fff487a3f486f11ab4b860.tar.gz
avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/avutil.h2
-rw-r--r--libavutil/opt.c10
-rw-r--r--libavutil/opt.h10
3 files changed, 21 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 9c660f3a99..0299bdf797 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 5
+#define LIBAVUTIL_VERSION_MINOR 6
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 172fcec456..7775bb2af3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -320,6 +320,16 @@ int64_t av_get_int(void *obj, const char *name, const AVOption **o_out)
return num*intnum/den;
}
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name)
+{
+ const AVOption *field = av_find_opt(obj, field_name, NULL, 0, 0);
+ const AVOption *flag = av_find_opt(obj, flag_name, NULL, 0, 0);
+
+ if (!field || !flag || flag->type != FF_OPT_TYPE_CONST)
+ return 0;
+ return av_get_int(obj, field_name, NULL) & (int) flag->default_val.dbl;
+}
+
static void opt_list(void *obj, void *av_log_obj, const char *unit,
int req_flags, int rej_flags)
{
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 8c3b6c1c36..46ad8acce1 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -181,4 +181,14 @@ int av_set_options_string(void *ctx, const char *opts,
*/
void av_opt_free(void *obj);
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ * isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
#endif /* AVUTIL_OPT_H */