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
706741e8
Commit
706741e8
authored
Jan 14, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: properly close down muxers on av_interleaved_write_frame() failure
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
4ff77d44
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
4 deletions
+15
-4
ffmpeg.c
ffmpeg.c
+15
-4
No files found.
ffmpeg.c
View file @
706741e8
...
...
@@ -313,6 +313,7 @@ void term_exit(void)
static
volatile
int
received_sigterm
=
0
;
static
volatile
int
received_nb_signals
=
0
;
static
int
main_return_code
=
0
;
static
void
sigterm_handler
(
int
sig
)
...
...
@@ -547,6 +548,15 @@ static void update_benchmark(const char *fmt, ...)
}
}
static
void
close_all_output_streams
(
OutputStream
*
ost
,
int
this_stream
,
int
others
)
{
int
i
;
for
(
i
=
0
;
i
<
nb_output_streams
;
i
++
)
{
OutputStream
*
ost2
=
output_streams
[
i
];
ost2
->
finished
|=
ost
==
ost2
?
this_stream
:
others
;
}
}
static
void
write_frame
(
AVFormatContext
*
s
,
AVPacket
*
pkt
,
OutputStream
*
ost
)
{
AVBitStreamFilterContext
*
bsfc
=
ost
->
bitstream_filters
;
...
...
@@ -647,7 +657,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
ret
=
av_interleaved_write_frame
(
s
,
pkt
);
if
(
ret
<
0
)
{
print_error
(
"av_interleaved_write_frame()"
,
ret
);
exit_program
(
1
);
main_return_code
=
1
;
close_all_output_streams
(
ost
,
3
,
1
);
}
}
...
...
@@ -655,7 +666,7 @@ static void close_output_stream(OutputStream *ost)
{
OutputFile
*
of
=
output_files
[
ost
->
file_index
];
ost
->
finished
=
1
;
ost
->
finished
|
=
1
;
if
(
of
->
shortest
)
{
int64_t
end
=
av_rescale_q
(
ost
->
sync_opts
-
ost
->
first_pts
,
ost
->
st
->
codec
->
time_base
,
AV_TIME_BASE_Q
);
of
->
recording_time
=
FFMIN
(
of
->
recording_time
,
end
);
...
...
@@ -3568,6 +3579,6 @@ int main(int argc, char **argv)
if
((
decode_error_stat
[
0
]
+
decode_error_stat
[
1
])
*
max_error_rate
<
decode_error_stat
[
1
])
exit_program
(
69
);
exit_program
(
received_nb_signals
?
255
:
0
);
return
0
;
exit_program
(
received_nb_signals
?
255
:
main_return_code
);
return
main_return_code
;
}
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