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
517fe644
Commit
517fe644
authored
Jun 11, 2016
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mux: do not call write_header multiple times if it fails the first time
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
b577d421
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
internal.h
libavformat/internal.h
+1
-0
mux.c
libavformat/mux.c
+3
-2
No files found.
libavformat/internal.h
View file @
517fe644
...
...
@@ -124,6 +124,7 @@ struct AVFormatInternal {
* Whether or not a header has already been written
*/
int
header_written
;
int
write_header_ret
;
};
struct
AVStreamInternal
{
...
...
libavformat/mux.c
View file @
517fe644
...
...
@@ -479,6 +479,7 @@ static int write_header_internal(AVFormatContext *s)
int
ret
=
s
->
oformat
->
write_header
(
s
);
if
(
ret
>=
0
&&
s
->
pb
&&
s
->
pb
->
error
<
0
)
ret
=
s
->
pb
->
error
;
s
->
internal
->
write_header_ret
=
ret
;
if
(
ret
<
0
)
return
ret
;
if
(
s
->
flush_packets
&&
s
->
pb
&&
s
->
pb
->
error
>=
0
&&
s
->
flags
&
AVFMT_FLAG_FLUSH_PACKETS
)
...
...
@@ -713,7 +714,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
did_split
=
av_packet_split_side_data
(
pkt
);
if
(
!
s
->
internal
->
header_written
)
{
ret
=
write_header_internal
(
s
);
ret
=
s
->
internal
->
write_header_ret
?
s
->
internal
->
write_header_ret
:
write_header_internal
(
s
);
if
(
ret
<
0
)
goto
fail
;
}
...
...
@@ -1152,7 +1153,7 @@ int av_write_trailer(AVFormatContext *s)
}
if
(
!
s
->
internal
->
header_written
)
{
ret
=
write_header_internal
(
s
);
ret
=
s
->
internal
->
write_header_ret
?
s
->
internal
->
write_header_ret
:
write_header_internal
(
s
);
if
(
ret
<
0
)
goto
fail
;
}
...
...
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