Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
04e5cf98
Commit
04e5cf98
authored
Oct 19, 2013
by
Denis Charmet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add HEVC support in MKV
parent
6ea63753
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+1
-0
modules/demux/mkv/matroska_segment_parse.cpp
modules/demux/mkv/matroska_segment_parse.cpp
+5
-0
No files found.
modules/codec/avcodec/fourcc.c
View file @
04e5cf98
...
@@ -62,6 +62,7 @@ static const struct
...
@@ -62,6 +62,7 @@ static const struct
{
VLC_CODEC_SVQ1
,
AV_CODEC_ID_SVQ1
,
VIDEO_ES
},
{
VLC_CODEC_SVQ1
,
AV_CODEC_ID_SVQ1
,
VIDEO_ES
},
{
VLC_CODEC_SVQ3
,
AV_CODEC_ID_SVQ3
,
VIDEO_ES
},
{
VLC_CODEC_SVQ3
,
AV_CODEC_ID_SVQ3
,
VIDEO_ES
},
{
VLC_CODEC_HEVC
,
AV_CODEC_ID_HEVC
,
VIDEO_ES
},
{
VLC_CODEC_H264
,
AV_CODEC_ID_H264
,
VIDEO_ES
},
{
VLC_CODEC_H264
,
AV_CODEC_ID_H264
,
VIDEO_ES
},
{
VLC_CODEC_H263
,
AV_CODEC_ID_H263
,
VIDEO_ES
},
{
VLC_CODEC_H263
,
AV_CODEC_ID_H263
,
VIDEO_ES
},
{
VLC_CODEC_H263I
,
AV_CODEC_ID_H263I
,
VIDEO_ES
},
{
VLC_CODEC_H263I
,
AV_CODEC_ID_H263I
,
VIDEO_ES
},
...
...
modules/demux/mkv/matroska_segment_parse.cpp
View file @
04e5cf98
...
@@ -1365,6 +1365,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
...
@@ -1365,6 +1365,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
fill_extra_data
(
p_tk
,
0
);
fill_extra_data
(
p_tk
,
0
);
}
}
}
}
else
if
(
!
strncmp
(
p_tk
->
psz_codec
,
"V_MPEGH/ISO/HEVC"
,
16
)
)
{
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_HEVC
;
fill_extra_data
(
p_tk
,
0
);
}
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"V_QUICKTIME"
)
)
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"V_QUICKTIME"
)
)
{
{
MP4_Box_t
*
p_box
=
(
MP4_Box_t
*
)
xmalloc
(
sizeof
(
MP4_Box_t
)
);
MP4_Box_t
*
p_box
=
(
MP4_Box_t
*
)
xmalloc
(
sizeof
(
MP4_Box_t
)
);
...
...
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