summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-08-09 16:21:07 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-08-12 23:52:55 +0200
commita25346e65cc2f46e3a9ec1a12312a09cd9b132ed (patch)
tree5a4778b46313c674cb23c4772288df4fc559afd5 /libavutil
parent3239382aefd0f5fa9ffd1509ccaedd59a54ec9af (diff)
lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/opt.c1
-rw-r--r--libavutil/opt.h1
-rw-r--r--libavutil/version.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 02869e44c7..0adbdddace 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -634,6 +634,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
}
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.');
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.');
+ av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.');
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.');
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.');
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
diff --git a/libavutil/opt.h b/libavutil/opt.h
index b947814768..3bf30a582d 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -279,6 +279,7 @@ typedef struct AVOption {
#define AV_OPT_FLAG_AUDIO_PARAM 8
#define AV_OPT_FLAG_VIDEO_PARAM 16
#define AV_OPT_FLAG_SUBTITLE_PARAM 32
+#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
//FIXME think about enc-audio, ... style flags
/**
diff --git a/libavutil/version.h b/libavutil/version.h
index 6b3e4860e1..0e381b75ae 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -39,7 +39,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 68
+#define LIBAVUTIL_VERSION_MINOR 69
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \