aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-20 03:53:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-04-12 20:25:10 +0200
commit4f698be8f65d554b79e8cf7dac53236b3c15a611 (patch)
tree7e1a310e86f6fecdfb1ed02c02562bbf61176c48 /libavutil
parente89f3d0ed21259a714a8bd5d05d95af5b1e0f73f (diff)
downloadffmpeg-4f698be8f65d554b79e8cf7dac53236b3c15a611.tar.gz
avutil/log: add av_log_get_flags()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/log.c5
-rw-r--r--libavutil/log.h1
-rw-r--r--libavutil/version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c
index 8b8f54b968..cf4d990b6c 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -345,6 +345,11 @@ void av_log_set_flags(int arg)
flags = arg;
}
+int av_log_get_flags(void)
+{
+ return flags;
+}
+
void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
{
av_log_callback = callback;
diff --git a/libavutil/log.h b/libavutil/log.h
index 665c65144e..d56d8436d2 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -322,6 +322,7 @@ void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
*/
#define AV_LOG_SKIP_REPEATED 1
void av_log_set_flags(int arg);
+int av_log_get_flags(void);
/**
* @}
diff --git a/libavutil/version.h b/libavutil/version.h
index bffa69e831..d1813a5e1a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -56,7 +56,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 75
+#define LIBAVUTIL_VERSION_MINOR 76
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \