RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66' 

* commit '25a1ba814ad80056247fd357ec4c6911324a3f66':
  log: Have function parameter names match between .c and .h file

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-12 14:41:24 +01:00
parent bb6b1731eb 25a1ba814a
commit 74744790a3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/log.c
View File

@ -185,10 +185,10 @@ static int get_category(void *ptr){
return avc->category + 16;
}
static void format_line(void *ptr, int level, const char *fmt, va_list vl,
static void format_line(void *avcl, int level, const char *fmt, va_list vl,
AVBPrint part[3], int *print_prefix, int type[2])
{
AVClass* avc = ptr ? *(AVClass **) ptr : NULL;
AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
av_bprint_init(part+0, 0, 1);
av_bprint_init(part+1, 0, 1);
av_bprint_init(part+2, 0, 65536);
@ -196,7 +196,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;
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) {
av_bprintf(part+0, "[%s @ %p] ",
@ -205,8 +205,8 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
}
}
av_bprintf(part+1, "[%s @ %p] ",
avc->item_name(ptr), ptr);
if(type) type[1] = get_category(ptr);
avc->item_name(avcl), avcl);
if(type) type[1] = get_category(avcl);
}
av_vbprintf(part+2, fmt, vl);

5
libavutil/log.h
View File

@ -260,9 +260,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