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
6f1260f8
Commit
6f1260f8
authored
Mar 16, 2011
by
Aurelien Jacobs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
matroskadec: set a default duration also for packets comming from a simple block
parent
69aab680
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
matroskadec.c
libavformat/matroskadec.c
+2
-2
No files found.
libavformat/matroskadec.c
View file @
6f1260f8
...
@@ -486,7 +486,7 @@ static EbmlSyntax matroska_segments[] = {
...
@@ -486,7 +486,7 @@ static EbmlSyntax matroska_segments[] = {
static
EbmlSyntax
matroska_blockgroup
[]
=
{
static
EbmlSyntax
matroska_blockgroup
[]
=
{
{
MATROSKA_ID_BLOCK
,
EBML_BIN
,
0
,
offsetof
(
MatroskaBlock
,
bin
)
},
{
MATROSKA_ID_BLOCK
,
EBML_BIN
,
0
,
offsetof
(
MatroskaBlock
,
bin
)
},
{
MATROSKA_ID_SIMPLEBLOCK
,
EBML_BIN
,
0
,
offsetof
(
MatroskaBlock
,
bin
)
},
{
MATROSKA_ID_SIMPLEBLOCK
,
EBML_BIN
,
0
,
offsetof
(
MatroskaBlock
,
bin
)
},
{
MATROSKA_ID_BLOCKDURATION
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
duration
)
,
{.
u
=
AV_NOPTS_VALUE
}
},
{
MATROSKA_ID_BLOCKDURATION
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
duration
)
},
{
MATROSKA_ID_BLOCKREFERENCE
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
reference
)
},
{
MATROSKA_ID_BLOCKREFERENCE
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
reference
)
},
{
1
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
non_simple
),
{.
u
=
1
}
},
{
1
,
EBML_UINT
,
0
,
offsetof
(
MatroskaBlock
,
non_simple
),
{.
u
=
1
}
},
{
0
}
{
0
}
...
@@ -1622,7 +1622,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
...
@@ -1622,7 +1622,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
st
=
track
->
stream
;
st
=
track
->
stream
;
if
(
st
->
discard
>=
AVDISCARD_ALL
)
if
(
st
->
discard
>=
AVDISCARD_ALL
)
return
res
;
return
res
;
if
(
duration
==
AV_NOPTS_VALUE
)
if
(
!
duration
)
duration
=
track
->
default_duration
/
matroska
->
time_scale
;
duration
=
track
->
default_duration
/
matroska
->
time_scale
;
block_time
=
AV_RB16
(
data
);
block_time
=
AV_RB16
(
data
);
...
...
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