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
16b6839d
Commit
16b6839d
authored
Oct 12, 2013
by
Yusuke Nakamura
Committed by
Michael Niedermayer
Oct 15, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/matroskadec: Support HEVC demuxing.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
53f903b7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
matroska.c
libavformat/matroska.c
+1
-0
matroskadec.c
libavformat/matroskadec.c
+2
-1
No files found.
libavformat/matroska.c
View file @
16b6839d
...
...
@@ -88,6 +88,7 @@ const CodecTags ff_mkv_codec_tags[]={
{
"V_MPEG4/ISO/AP"
,
AV_CODEC_ID_MPEG4
},
{
"V_MPEG4/ISO/SP"
,
AV_CODEC_ID_MPEG4
},
{
"V_MPEG4/ISO/AVC"
,
AV_CODEC_ID_H264
},
{
"V_MPEGH/ISO/HEVC"
,
AV_CODEC_ID_HEVC
},
{
"V_MPEG4/MS/V3"
,
AV_CODEC_ID_MSMPEG4V3
},
{
"V_PRORES"
,
AV_CODEC_ID_PRORES
},
{
"V_REAL/RV10"
,
AV_CODEC_ID_RV10
},
...
...
libavformat/matroskadec.c
View file @
16b6839d
...
...
@@ -1843,7 +1843,8 @@ static int matroska_read_header(AVFormatContext *s)
st
->
codec
->
height
*
track
->
video
.
display_width
,
st
->
codec
->
width
*
track
->
video
.
display_height
,
255
);
st
->
need_parsing
=
AVSTREAM_PARSE_HEADERS
;
if
(
st
->
codec
->
codec_id
!=
AV_CODEC_ID_HEVC
)
st
->
need_parsing
=
AVSTREAM_PARSE_HEADERS
;
if
(
track
->
default_duration
)
{
av_reduce
(
&
st
->
avg_frame_rate
.
num
,
&
st
->
avg_frame_rate
.
den
,
1000000000
,
track
->
default_duration
,
30000
);
...
...
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