Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
57fee78f
Commit
57fee78f
authored
May 19, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support for webm/mkv and VP8 inside it
We now should wait for libvpx integration
parent
88948250
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
modules/demux/mkv/demux.cpp
modules/demux/mkv/demux.cpp
+1
-1
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/matroska_segment.cpp
+4
-0
No files found.
modules/demux/mkv/demux.cpp
View file @
57fee78f
...
...
@@ -66,7 +66,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
p_l0
->
Read
(
*
p_estream
,
EbmlHead
::
ClassInfos
.
Context
,
i_upper_lvl
,
p_l0
,
true
);
EDocType
doc_type
=
GetChild
<
EDocType
>
(
*
static_cast
<
EbmlHead
*>
(
p_l0
));
if
(
std
::
string
(
doc_type
)
!=
"matroska"
)
if
(
std
::
string
(
doc_type
)
!=
"matroska"
&&
std
::
string
(
doc_type
)
!=
"webm"
)
{
msg_Err
(
p_demux
,
"Not a Matroska file : DocType = %s "
,
std
::
string
(
doc_type
).
c_str
());
return
NULL
;
...
...
modules/demux/mkv/matroska_segment.cpp
View file @
57fee78f
...
...
@@ -858,6 +858,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
{
tracks
[
i_track
]
->
fmt
.
i_codec
=
VLC_CODEC_DIRAC
;
}
else
if
(
!
strncmp
(
tracks
[
i_track
]
->
psz_codec
,
"V_VP8"
,
5
)
)
{
tracks
[
i_track
]
->
fmt
.
i_codec
=
VLC_CODEC_VP8
;
}
else
if
(
!
strncmp
(
tracks
[
i_track
]
->
psz_codec
,
"V_MPEG4"
,
7
)
)
{
if
(
!
strcmp
(
tracks
[
i_track
]
->
psz_codec
,
"V_MPEG4/MS/V3"
)
)
...
...
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