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
11489bdb
Commit
11489bdb
authored
Apr 13, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: reject invalid real audio data
parent
137c37b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
10 deletions
+17
-10
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/matroska_segment.cpp
+17
-10
No files found.
modules/demux/mkv/matroska_segment.cpp
View file @
11489bdb
...
...
@@ -1262,17 +1262,24 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
p_fmt
->
audio
.
i_rate
=
8000
;
p_fmt
->
audio
.
i_blockalign
=
0x14
;
}
else
else
if
(
p_tk
->
i_extra_data
>
28
)
{
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/COOK"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_COOK
;
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/ATRC"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_ATRAC3
;
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/28_8"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_RA_288
;
/* FIXME RALF and SIPR */
fill_extra_data
(
p_tk
,
p_tk
->
fmt
.
i_codec
==
VLC_CODEC_RA_288
?
0
:
78
);
uint8_t
*
p
=
p_tk
->
p_extra_data
;
if
(
memcmp
(
p
,
".ra"
,
3
)
)
{
msg_Err
(
&
sys
.
demuxer
,
"Invalid Real ExtraData 0x%4.4s"
,
(
char
*
)
p
);
p_tk
->
fmt
.
i_codec
=
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
);
}
else
{
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/COOK"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_COOK
;
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/ATRC"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_ATRAC3
;
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"A_REAL/28_8"
)
)
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_RA_288
;
/* FIXME RALF and SIPR */
fill_extra_data
(
p_tk
,
p_tk
->
fmt
.
i_codec
==
VLC_CODEC_RA_288
?
0
:
78
);
}
}
}
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"S_KATE"
)
)
...
...
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