diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 17:41:24 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 17:41:24 +0400 |
| commit | 74744790a366ed53cfafa2b0720c27b1eaef770a (patch) | |
| tree | 0f9c54c49bb63764ce3474117bdf6af043bbcd56 /libavutil/log.h | |
| parent | bb6b1731eba2fac424ff8ad3003fe58b308debd1 (diff) | |
| parent | 25a1ba814ad80056247fd357ec4c6911324a3f66 (diff) | |
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>
Diffstat (limited to 'libavutil/log.h')
| -rw-r--r-- | libavutil/log.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/log.h b/libavutil/log.h index 55459e811a..5fb476f948 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -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 |