diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
commit | af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (patch) | |
tree | f093e566a4985317a2dc7d9f3f5df38599142720 /libavutil/log.h | |
parent | 80a9297b711b7acb152ebbf84b28772945f920ea (diff) | |
parent | 523c7bd23c781aa0f3a85044896f5e18e8b52534 (diff) | |
download | ffmpeg-streaming-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.zip ffmpeg-streaming-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.tar.gz |
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.h')
-rw-r--r-- | libavutil/log.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/log.h b/libavutil/log.h index 6c44553..7ea95fa 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -82,10 +82,11 @@ typedef struct AVClass { 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 + * Offset in the structure where a pointer to the parent context for + * logging is stored. For example a decoder could pass its AVCodecContext + * to eval as such a parent context, which an av_log() implementation + * could then leverage to display the parent context. + * The offset can be NULL. */ int parent_log_context_offset; @@ -95,7 +96,7 @@ typedef struct AVClass { void* (*child_next)(void *obj, void *prev); /** - * Return an AVClass corresponding to next potential + * Return an AVClass corresponding to the next potential * AVOptions-enabled child. * * The difference between child_next and this is that |