From 4f698be8f65d554b79e8cf7dac53236b3c15a611 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 20 Mar 2014 03:53:22 +0100
Subject: [PATCH] avutil/log: add av_log_get_flags()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 doc/APIchanges      | 3 +++
 libavutil/log.c     | 5 +++++
 libavutil/log.h     | 1 +
 libavutil/version.h | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 37b9ef8d12..a53647faac 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2012-10-22
 
 API changes, most recent first:
 
+2014-04-12 - xxxxxxx - lavu 52.76.100 - log.h
+  Add av_log_get_flags()
+
 2014-04-xx - xxxxxxx - lavd 55.12.100 - avdevice.h
   Add avdevice_capabilities_create() function.
   Add avdevice_capabilities_free() function.
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, \