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
b557f55d
Commit
b557f55d
authored
Jun 06, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: ts: fix IOD parsing (fix #11573)
IOD bytes must be read in order. introduced by
8fdf1f20
parent
ccc273b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
modules/demux/ts.c
modules/demux/ts.c
+2
-2
No files found.
modules/demux/ts.c
View file @
b557f55d
...
...
@@ -2625,6 +2625,7 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
ts_debug
(
"
\n
* ERR missing DecoderConfigDescr"
);
continue
;
}
int
i_config_desc_length
=
IODDescriptorLength
(
&
i_data
,
&
p_data
);
/* DecoderConfigDescr_length */
decoder_config_descriptor_t
*
dec_descr
=
&
es_descr
->
dec_descr
;
dec_descr
->
i_objectTypeIndication
=
IODGetBytes
(
&
i_data
,
&
p_data
,
1
);
i_flags
=
IODGetBytes
(
&
i_data
,
&
p_data
,
1
);
...
...
@@ -2634,8 +2635,7 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
IODGetBytes
(
&
i_data
,
&
p_data
,
4
);
/* maxBitrate */
IODGetBytes
(
&
i_data
,
&
p_data
,
4
);
/* avgBitrate */
int
i_decoderConfigDescr_length
=
IODDescriptorLength
(
&
i_data
,
&
p_data
);
if
(
i_decoderConfigDescr_length
>
13
&&
IODGetBytes
(
&
i_data
,
&
p_data
,
1
)
==
0x05
)
if
(
i_config_desc_length
>
13
&&
IODGetBytes
(
&
i_data
,
&
p_data
,
1
)
==
0x05
)
{
dec_descr
->
i_extra
=
IODDescriptorLength
(
&
i_data
,
&
p_data
);
if
(
dec_descr
->
i_extra
>
0
)
...
...
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