virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

log: Have function parameter names match between .c and .h file

Browse Source 
This fixes two related Doxygen warnings.
This commit is contained in:
Diego Biurrun 2014-02-11 22:15:06 +01:00
parent 52771346dc
commit 25a1ba814a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/log.c
View File

@ -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);

5
libavutil/log.h
View File

@ -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