Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
a3c4371f
Commit
a3c4371f
authored
Feb 10, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: prefer NULL over 0 for av_log context pointer parameter.
parent
158bd596
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
ffmpeg.c
ffmpeg.c
+10
-10
No files found.
ffmpeg.c
View file @
a3c4371f
...
@@ -2107,7 +2107,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
...
@@ -2107,7 +2107,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
av_buffersrc_buffer
(
ost
->
input_video_filter
,
fb
);
av_buffersrc_buffer
(
ost
->
input_video_filter
,
fb
);
}
else
}
else
if
((
av_vsrc_buffer_add_frame
(
ost
->
input_video_filter
,
decoded_frame
,
AV_VSRC_BUF_FLAG_OVERWRITE
))
<
0
){
if
((
av_vsrc_buffer_add_frame
(
ost
->
input_video_filter
,
decoded_frame
,
AV_VSRC_BUF_FLAG_OVERWRITE
))
<
0
){
av_log
(
0
,
AV_LOG_FATAL
,
"Failed to inject frame into filter network
\n
"
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"Failed to inject frame into filter network
\n
"
);
exit_program
(
1
);
exit_program
(
1
);
}
}
}
}
...
@@ -2128,7 +2128,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
...
@@ -2128,7 +2128,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
AVFrame
*
filtered_frame
;
AVFrame
*
filtered_frame
;
if
(
av_buffersink_get_buffer_ref
(
ost
->
output_video_filter
,
&
ost
->
picref
,
0
)
<
0
){
if
(
av_buffersink_get_buffer_ref
(
ost
->
output_video_filter
,
&
ost
->
picref
,
0
)
<
0
){
av_log
(
0
,
AV_LOG_WARNING
,
"AV Filter told us it has a frame available but failed to output one
\n
"
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"AV Filter told us it has a frame available but failed to output one
\n
"
);
goto
cont
;
goto
cont
;
}
}
if
(
!
ist
->
filtered_frame
&&
!
(
ist
->
filtered_frame
=
avcodec_alloc_frame
()))
{
if
(
!
ist
->
filtered_frame
&&
!
(
ist
->
filtered_frame
=
avcodec_alloc_frame
()))
{
...
@@ -3563,13 +3563,13 @@ static void assert_file_overwrite(const char *filename)
...
@@ -3563,13 +3563,13 @@ static void assert_file_overwrite(const char *filename)
term_exit
();
term_exit
();
signal
(
SIGINT
,
SIG_DFL
);
signal
(
SIGINT
,
SIG_DFL
);
if
(
!
read_yesno
())
{
if
(
!
read_yesno
())
{
av_log
(
0
,
AV_LOG_FATAL
,
"Not overwriting - exiting
\n
"
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"Not overwriting - exiting
\n
"
);
exit_program
(
1
);
exit_program
(
1
);
}
}
term_init
();
term_init
();
}
}
else
{
else
{
av_log
(
0
,
AV_LOG_FATAL
,
"File '%s' already exists. Exiting.
\n
"
,
filename
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"File '%s' already exists. Exiting.
\n
"
,
filename
);
exit_program
(
1
);
exit_program
(
1
);
}
}
}
}
...
@@ -4820,9 +4820,9 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
...
@@ -4820,9 +4820,9 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
if
(
!
(
f
=
get_preset_file
(
filename
,
sizeof
(
filename
),
arg
,
*
opt
==
'f'
,
codec_name
)))
{
if
(
!
(
f
=
get_preset_file
(
filename
,
sizeof
(
filename
),
arg
,
*
opt
==
'f'
,
codec_name
)))
{
if
(
!
strncmp
(
arg
,
"libx264-lossless"
,
strlen
(
"libx264-lossless"
))){
if
(
!
strncmp
(
arg
,
"libx264-lossless"
,
strlen
(
"libx264-lossless"
))){
av_log
(
0
,
AV_LOG_FATAL
,
"Please use -preset <speed> -qp 0
\n
"
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"Please use -preset <speed> -qp 0
\n
"
);
}
else
}
else
av_log
(
0
,
AV_LOG_FATAL
,
"File for preset '%s' not found
\n
"
,
arg
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"File for preset '%s' not found
\n
"
,
arg
);
exit_program
(
1
);
exit_program
(
1
);
}
}
...
@@ -4832,7 +4832,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
...
@@ -4832,7 +4832,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
continue
;
continue
;
e
|=
sscanf
(
line
,
"%999[^=]=%999[^
\n
]
\n
"
,
tmp
,
tmp2
)
-
2
;
e
|=
sscanf
(
line
,
"%999[^=]=%999[^
\n
]
\n
"
,
tmp
,
tmp2
)
-
2
;
if
(
e
){
if
(
e
){
av_log
(
0
,
AV_LOG_FATAL
,
"%s: Invalid syntax: '%s'
\n
"
,
filename
,
line
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"%s: Invalid syntax: '%s'
\n
"
,
filename
,
line
);
exit_program
(
1
);
exit_program
(
1
);
}
}
if
(
!
strcmp
(
tmp
,
"acodec"
)){
if
(
!
strcmp
(
tmp
,
"acodec"
)){
...
@@ -4844,7 +4844,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
...
@@ -4844,7 +4844,7 @@ static int opt_preset(OptionsContext *o, const char *opt, const char *arg)
}
else
if
(
!
strcmp
(
tmp
,
"dcodec"
)){
}
else
if
(
!
strcmp
(
tmp
,
"dcodec"
)){
opt_data_codec
(
o
,
tmp
,
tmp2
);
opt_data_codec
(
o
,
tmp
,
tmp2
);
}
else
if
(
opt_default
(
tmp
,
tmp2
)
<
0
){
}
else
if
(
opt_default
(
tmp
,
tmp2
)
<
0
){
av_log
(
0
,
AV_LOG_FATAL
,
"%s: Invalid option or argument: '%s', parsed as '%s' = '%s'
\n
"
,
filename
,
line
,
tmp
,
tmp2
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"%s: Invalid option or argument: '%s', parsed as '%s' = '%s'
\n
"
,
filename
,
line
,
tmp
,
tmp2
);
exit_program
(
1
);
exit_program
(
1
);
}
}
}
}
...
@@ -4879,7 +4879,7 @@ static int opt_old2new(OptionsContext *o, const char *opt, const char *arg)
...
@@ -4879,7 +4879,7 @@ static int opt_old2new(OptionsContext *o, const char *opt, const char *arg)
static
int
opt_bitrate
(
OptionsContext
*
o
,
const
char
*
opt
,
const
char
*
arg
)
static
int
opt_bitrate
(
OptionsContext
*
o
,
const
char
*
opt
,
const
char
*
arg
)
{
{
if
(
!
strcmp
(
opt
,
"b"
)){
if
(
!
strcmp
(
opt
,
"b"
)){
av_log
(
0
,
AV_LOG_WARNING
,
"Please use -b:a or -b:v, -b is ambiguous
\n
"
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Please use -b:a or -b:v, -b is ambiguous
\n
"
);
return
parse_option
(
o
,
"b:v"
,
arg
,
options
);
return
parse_option
(
o
,
"b:v"
,
arg
,
options
);
}
}
return
opt_default
(
opt
,
arg
);
return
opt_default
(
opt
,
arg
);
...
@@ -4890,7 +4890,7 @@ static int opt_qscale(OptionsContext *o, const char *opt, const char *arg)
...
@@ -4890,7 +4890,7 @@ static int opt_qscale(OptionsContext *o, const char *opt, const char *arg)
char
*
s
;
char
*
s
;
int
ret
;
int
ret
;
if
(
!
strcmp
(
opt
,
"qscale"
)){
if
(
!
strcmp
(
opt
,
"qscale"
)){
av_log
(
0
,
AV_LOG_WARNING
,
"Please use -q:a or -q:v, -qscale is ambiguous
\n
"
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Please use -q:a or -q:v, -qscale is ambiguous
\n
"
);
return
parse_option
(
o
,
"q:v"
,
arg
,
options
);
return
parse_option
(
o
,
"q:v"
,
arg
,
options
);
}
}
s
=
av_asprintf
(
"q%s"
,
opt
+
6
);
s
=
av_asprintf
(
"q%s"
,
opt
+
6
);
...
...
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