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
5fa43f76
Commit
5fa43f76
authored
Oct 05, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smoothstreamingenc: Properly return errors from ism_flush to the caller
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
eb2f3910
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
smoothstreamingenc.c
libavformat/smoothstreamingenc.c
+5
-2
No files found.
libavformat/smoothstreamingenc.c
View file @
5fa43f76
...
@@ -551,7 +551,8 @@ static int ism_flush(AVFormatContext *s, int final)
...
@@ -551,7 +551,8 @@ static int ism_flush(AVFormatContext *s, int final)
}
}
}
}
write_manifest
(
s
,
final
);
if
(
ret
>=
0
)
ret
=
write_manifest
(
s
,
final
);
return
ret
;
return
ret
;
}
}
...
@@ -561,13 +562,15 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -561,13 +562,15 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
AVStream
*
st
=
s
->
streams
[
pkt
->
stream_index
];
AVStream
*
st
=
s
->
streams
[
pkt
->
stream_index
];
OutputStream
*
os
=
&
c
->
streams
[
pkt
->
stream_index
];
OutputStream
*
os
=
&
c
->
streams
[
pkt
->
stream_index
];
int64_t
end_pts
=
(
c
->
nb_fragments
+
1
)
*
c
->
min_frag_duration
;
int64_t
end_pts
=
(
c
->
nb_fragments
+
1
)
*
c
->
min_frag_duration
;
int
ret
;
if
((
!
c
->
has_video
||
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
if
((
!
c
->
has_video
||
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
av_compare_ts
(
pkt
->
pts
,
st
->
time_base
,
av_compare_ts
(
pkt
->
pts
,
st
->
time_base
,
end_pts
,
AV_TIME_BASE_Q
)
>=
0
&&
end_pts
,
AV_TIME_BASE_Q
)
>=
0
&&
pkt
->
flags
&
AV_PKT_FLAG_KEY
&&
os
->
packets_written
)
{
pkt
->
flags
&
AV_PKT_FLAG_KEY
&&
os
->
packets_written
)
{
ism_flush
(
s
,
0
);
if
((
ret
=
ism_flush
(
s
,
0
))
<
0
)
return
ret
;
c
->
nb_fragments
++
;
c
->
nb_fragments
++
;
}
}
...
...
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