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
14764a96
Commit
14764a96
authored
Jan 18, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression introduced in [24381]
parent
ca42fbe0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
modules/packetizer/h264.c
modules/packetizer/h264.c
+5
-3
No files found.
modules/packetizer/h264.c
View file @
14764a96
...
@@ -247,14 +247,16 @@ static int Open( vlc_object_t *p_this )
...
@@ -247,14 +247,16 @@ static int Open( vlc_object_t *p_this )
p_dec
->
fmt_out
.
i_extra
=
0
;
p_dec
->
fmt_out
.
p_extra
=
NULL
;
p_dec
->
fmt_out
.
i_extra
=
0
;
p_dec
->
fmt_out
.
p_extra
=
NULL
;
/* Set the new extradata */
/* Set the new extradata */
p_dec
->
fmt_out
.
i_extra
=
p_sys
->
p_pps
->
i_buffer
+
p_sys
->
p_sps
->
i_buffer
;
p_dec
->
fmt_out
.
p_extra
=
(
uint8_t
*
)
malloc
(
p_dec
->
fmt_out
.
i_extra
);
p_dec
->
fmt_out
.
p_extra
=
(
uint8_t
*
)
malloc
(
p_dec
->
fmt_out
.
i_extra
);
if
(
p_dec
->
fmt_out
.
p_extra
)
if
(
p_dec
->
fmt_out
.
p_extra
)
{
{
p_dec
->
fmt_out
.
i_extra
=
p_sys
->
p_pps
->
i_buffer
+
p_sys
->
p_sps
->
i_buffer
;
memcpy
(
(
uint8_t
*
)
p_dec
->
fmt_out
.
p_extra
,
p_sys
->
p_sps
->
p_buffer
,
p_sys
->
p_sps
->
i_buffer
);
memcpy
(
(
uint8_t
*
)
p_dec
->
fmt_out
.
p_extra
,
p_sys
->
p_sps
->
p_buffer
,
p_sys
->
p_sps
->
i_buffer
);
memcpy
(
(
uint8_t
*
)
p_dec
->
fmt_out
.
p_extra
+
p_sys
->
p_sps
->
i_buffer
,
p_sys
->
p_pps
->
p_buffer
,
p_sys
->
p_pps
->
i_buffer
);
memcpy
(
(
uint8_t
*
)
p_dec
->
fmt_out
.
p_extra
+
p_sys
->
p_sps
->
i_buffer
,
p_sys
->
p_pps
->
p_buffer
,
p_sys
->
p_pps
->
i_buffer
);
p_sys
->
b_header
=
VLC_TRUE
;
p_sys
->
b_header
=
VLC_TRUE
;
}
}
else
p_dec
->
fmt_out
.
i_extra
=
0
;
/* Set callback */
/* Set callback */
p_dec
->
pf_packetize
=
PacketizeAVC1
;
p_dec
->
pf_packetize
=
PacketizeAVC1
;
}
}
...
@@ -485,10 +487,10 @@ static void nal_get_decoded( uint8_t **pp_ret, int *pi_ret,
...
@@ -485,10 +487,10 @@ static void nal_get_decoded( uint8_t **pp_ret, int *pi_ret,
uint8_t
*
end
=
&
src
[
i_src
];
uint8_t
*
end
=
&
src
[
i_src
];
uint8_t
*
dst
=
malloc
(
i_src
);
uint8_t
*
dst
=
malloc
(
i_src
);
*
pp_ret
=
dst
;
if
(
dst
)
if
(
dst
)
{
{
*
pp_ret
=
dst
;
while
(
src
<
end
)
while
(
src
<
end
)
{
{
if
(
src
<
end
-
3
&&
src
[
0
]
==
0x00
&&
src
[
1
]
==
0x00
&&
if
(
src
<
end
-
3
&&
src
[
0
]
==
0x00
&&
src
[
1
]
==
0x00
&&
...
...
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