diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-11 22:15:06 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-02-12 12:08:02 +0100 |
| commit | 25a1ba814ad80056247fd357ec4c6911324a3f66 (patch) | |
| tree | bfc7ac8a4c573abef5f25bfd3dca36b93aef49a1 | |
| parent | 52771346dc7872e39c98508584d430567d3e8f31 (diff) | |
| download | ffmpeg-25a1ba814ad80056247fd357ec4c6911324a3f66.tar.gz | |
log: Have function parameter names match between .c and .h file
This fixes two related Doxygen warnings.
| -rw-r--r-- | libavutil/log.c | 8 | ||||
| -rw-r--r-- | libavutil/log.h | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 7d574f6f7b..3cc811bccc 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -94,20 +94,20 @@ const char *av_default_item_name(void *ptr) return (*(AVClass **) ptr)->class_name; } -void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) +void av_log_default_callback(void *avcl, int level, const char *fmt, va_list vl) { static int print_prefix = 1; static int count; static char prev[1024]; char line[1024]; static int is_atty; - AVClass* avc = ptr ? *(AVClass **) ptr : NULL; + AVClass* avc = avcl ? *(AVClass **) avcl : NULL; if (level > av_log_level) return; line[0] = 0; if (print_prefix && avc) { if (avc->parent_log_context_offset) { - AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) + + AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) + avc->parent_log_context_offset); if (parent && *parent) { snprintf(line, sizeof(line), "[%s @ %p] ", @@ -115,7 +115,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) } } snprintf(line + strlen(line), sizeof(line) - strlen(line), "[%s @ %p] ", - avc->item_name(ptr), ptr); + avc->item_name(avcl), avcl); } vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl); diff --git a/libavutil/log.h b/libavutil/log.h index 05d28264fc..6d26b67db8 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -219,9 +219,10 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)); * lavu_log_constants "Logging Constant". * @param fmt The format string (printf-compatible) that specifies how * subsequent arguments are converted to output. - * @param ap The arguments referenced by the format string. + * @param vl The arguments referenced by the format string. */ -void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); +void av_log_default_callback(void *avcl, int level, const char *fmt, + va_list vl); /** * Return the context name |