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
54aaa198
Commit
54aaa198
authored
Nov 04, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Real demuxer: correctly exit on errors when parsing Audio formats
parent
d3b67d8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
modules/demux/real.c
modules/demux/real.c
+10
-5
No files found.
modules/demux/real.c
View file @
54aaa198
...
@@ -1481,7 +1481,10 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
...
@@ -1481,7 +1481,10 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
i_frame_size
=
R16
(
&
p_data
,
&
i_data
);
i_frame_size
=
R16
(
&
p_data
,
&
i_data
);
i_subpacket_size
=
R16
(
&
p_data
,
&
i_data
);
i_subpacket_size
=
R16
(
&
p_data
,
&
i_data
);
if
(
!
i_frame_size
||
!
i_coded_frame_size
)
if
(
!
i_frame_size
||
!
i_coded_frame_size
)
{
es_format_Clean
(
&
fmt
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
RVoid
(
&
p_data
,
&
i_data
,
2
+
(
i_version
==
5
?
6
:
0
)
);
RVoid
(
&
p_data
,
&
i_data
,
2
+
(
i_version
==
5
?
6
:
0
)
);
...
@@ -1573,7 +1576,11 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
...
@@ -1573,7 +1576,11 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
case
VLC_FOURCC
(
's'
,
'i'
,
'p'
,
'r'
):
case
VLC_FOURCC
(
's'
,
'i'
,
'p'
,
'r'
):
fmt
.
i_codec
=
VLC_CODEC_SIPR
;
fmt
.
i_codec
=
VLC_CODEC_SIPR
;
if
(
i_flavor
>
3
)
if
(
i_flavor
>
3
)
{
msg_Dbg
(
p_demux
,
" - unsupported sipr flavorc=%i"
,
i_flavor
);
es_format_Clean
(
&
fmt
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
i_subpacket_size
=
i_subpacket_size_sipr
[
i_flavor
];
i_subpacket_size
=
i_subpacket_size_sipr
[
i_flavor
];
// The libavcodec sipr decoder requires stream bitrate
// The libavcodec sipr decoder requires stream bitrate
...
@@ -1612,13 +1619,11 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
...
@@ -1612,13 +1619,11 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
break
;
break
;
case
VLC_FOURCC
(
'r'
,
'a'
,
'l'
,
'f'
):
case
VLC_FOURCC
(
'r'
,
'a'
,
'l'
,
'f'
):
msg_Dbg
(
p_demux
,
" - audio codec not supported=%4.4s"
,
(
char
*
)
&
fmt
.
i_codec
);
break
;
default:
default:
msg_Dbg
(
p_demux
,
" - unknown audio codec=%4.4s"
,
msg_Dbg
(
p_demux
,
" - unknown audio codec=%4.4s"
,
(
char
*
)
&
fmt
.
i_codec
);
(
char
*
)
&
fmt
.
i_codec
);
es_format_Clean
(
&
fmt
);
return
VLC_EGENERIC
;
break
;
break
;
}
}
msg_Dbg
(
p_demux
,
" - extra data=%d"
,
fmt
.
i_extra
);
msg_Dbg
(
p_demux
,
" - extra data=%d"
,
fmt
.
i_extra
);
...
...
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