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
da46370e
Commit
da46370e
authored
Jul 09, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/matroskaenc: Do not needlessly allocate memory for cuepoints.
Fixes ticket #4690.
parent
dbf8352a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
matroskaenc.c
libavformat/matroskaenc.c
+3
-1
No files found.
libavformat/matroskaenc.c
View file @
da46370e
...
...
@@ -1772,7 +1772,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_
if
(
codec
->
codec_type
!=
AVMEDIA_TYPE_SUBTITLE
)
{
mkv_write_block
(
s
,
pb
,
MATROSKA_ID_SIMPLEBLOCK
,
pkt
,
keyframe
);
if
(
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
keyframe
||
add_cue
)
{
if
(
s
->
pb
->
seekable
&&
(
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
keyframe
||
add_cue
)
)
{
ret
=
mkv_add_cuepoint
(
mkv
->
cues
,
pkt
->
stream_index
,
dash_tracknum
,
ts
,
mkv
->
cluster_pos
,
relative_packet_pos
,
-
1
);
if
(
ret
<
0
)
return
ret
;
}
...
...
@@ -1792,11 +1792,13 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_
end_ebml_master
(
pb
,
blockgroup
);
}
if
(
s
->
pb
->
seekable
)
{
ret
=
mkv_add_cuepoint
(
mkv
->
cues
,
pkt
->
stream_index
,
dash_tracknum
,
ts
,
mkv
->
cluster_pos
,
relative_packet_pos
,
duration
);
if
(
ret
<
0
)
return
ret
;
}
}
mkv
->
duration
=
FFMAX
(
mkv
->
duration
,
ts
+
duration
);
return
0
;
...
...
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