Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
25a1ba81
Commit
25a1ba81
authored
Feb 11, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log: Have function parameter names match between .c and .h file
This fixes two related Doxygen warnings.
parent
52771346
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
log.c
libavutil/log.c
+4
-4
log.h
libavutil/log.h
+3
-2
No files found.
libavutil/log.c
View file @
25a1ba81
...
...
@@ -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
);
...
...
libavutil/log.h
View file @
25a1ba81
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment