aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-05-19 22:50:39 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-05-19 22:50:39 +0000
commit2c1bb26535b7c5476bc5cee4bd4c8f0fdadd1f27 (patch)
tree5e210d8d67d8f3d3567886e677128b1ceee120ad /libavutil
parent4e74187db2f5db52f88729efc662df9d6bc763e1 (diff)
downloadffmpeg-2c1bb26535b7c5476bc5cee4bd4c8f0fdadd1f27.tar.gz
Make it possible for a log context to keep track of its parent context.
This is usefull to keep track and display relations where things are a bit more complex (like AVProtocols or demuxers used by demuxers and such) Originally committed as revision 23199 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/avutil.h2
-rw-r--r--libavutil/log.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 4bfe024f6e..31f68612c5 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -41,7 +41,7 @@
#define LIBAVUTIL_VERSION_MAJOR 50
#define LIBAVUTIL_VERSION_MINOR 15
-#define LIBAVUTIL_VERSION_MICRO 2
+#define LIBAVUTIL_VERSION_MICRO 3
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
diff --git a/libavutil/log.h b/libavutil/log.h
index a21adb8586..0a413f6e8c 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -62,6 +62,14 @@ typedef struct {
* 0 means there is no such variable
*/
int log_level_offset_offset;
+
+ /**
+ * Offset in the structure where a pointer to the parent context for loging is stored.
+ * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
+ * parent context. And a av_log() implementation could then display the parent context
+ * can be NULL of course
+ */
+ int parent_log_context_offset;
} AVClass;
/* av_log API */