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
885932e3
Commit
885932e3
authored
Dec 03, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packetizer: h264: fix CreateRbspFromNAL argument type
and possibly uninitialized
parent
4392fc87
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
modules/packetizer/h264.c
modules/packetizer/h264.c
+3
-3
modules/packetizer/h264_nal.h
modules/packetizer/h264_nal.h
+1
-1
No files found.
modules/packetizer/h264.c
View file @
885932e3
...
@@ -896,7 +896,7 @@ static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice
...
@@ -896,7 +896,7 @@ static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice
{
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
uint8_t
*
pb_dec
;
uint8_t
*
pb_dec
;
int
i_dec
;
size_t
i_dec
=
0
;
int
i_slice_type
;
int
i_slice_type
;
slice_t
slice
;
slice_t
slice
;
bs_t
s
;
bs_t
s
;
...
@@ -1005,7 +1005,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
...
@@ -1005,7 +1005,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
{
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
uint8_t
*
pb_dec
;
uint8_t
*
pb_dec
;
int
i_dec
;
size_t
i_dec
=
0
;
/* */
/* */
CreateRbspFromNAL
(
&
pb_dec
,
&
i_dec
,
&
p_frag
->
p_buffer
[
5
],
p_frag
->
i_buffer
-
5
);
CreateRbspFromNAL
(
&
pb_dec
,
&
i_dec
,
&
p_frag
->
p_buffer
[
5
],
p_frag
->
i_buffer
-
5
);
...
@@ -1013,7 +1013,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
...
@@ -1013,7 +1013,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
return
;
return
;
/* The +1 is for rbsp trailing bits */
/* The +1 is for rbsp trailing bits */
for
(
in
t
i_used
=
0
;
i_used
+
1
<
i_dec
;
)
for
(
size_
t
i_used
=
0
;
i_used
+
1
<
i_dec
;
)
{
{
/* Read type */
/* Read type */
int
i_type
=
0
;
int
i_type
=
0
;
...
...
modules/packetizer/h264_nal.h
View file @
885932e3
...
@@ -107,7 +107,7 @@ struct nal_pps
...
@@ -107,7 +107,7 @@ struct nal_pps
int
i_pic_order_present_flag
;
int
i_pic_order_present_flag
;
};
};
static
inline
void
CreateRbspFromNAL
(
uint8_t
**
pp_ret
,
in
t
*
pi_ret
,
static
inline
void
CreateRbspFromNAL
(
uint8_t
**
pp_ret
,
size_
t
*
pi_ret
,
const
uint8_t
*
src
,
int
i_src
)
const
uint8_t
*
src
,
int
i_src
)
{
{
uint8_t
*
dst
=
malloc
(
i_src
);
uint8_t
*
dst
=
malloc
(
i_src
);
...
...
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