From a25346e65cc2f46e3a9ec1a12312a09cd9b132ed Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 9 Aug 2012 16:21:07 +0200
Subject: [PATCH] lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro
---
doc/APIchanges | 3 +++
libavutil/opt.c | 1 +
libavutil/opt.h | 1 +
libavutil/version.h | 2 +-
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 55b634d21d3..fd0abf5414e 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2011-04-18
API changes, most recent first:
+2012-08-13 - xxxxxxx - lavu 51.69.100 - opt.h
+ Add AV_OPT_FLAG_FILTERING_PARAM symbol in opt.h.
+
2012-07-31 - xxxxxxx - lavc 54.46.100
Add channels field to AVFrame.
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 02869e44c7b..0adbdddace7 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 b9478147680..3bf30a582d0 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 6b3e4860e10..0e381b75ae2 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, \
--
GitLab