Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
792c362e
Commit
792c362e
authored
May 26, 2016
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mediacodec: abort if ParseVideoExtraH264 fails
parent
458ed62b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
modules/codec/omxil/mediacodec.c
modules/codec/omxil/mediacodec.c
+7
-8
No files found.
modules/codec/omxil/mediacodec.c
View file @
792c362e
...
...
@@ -346,16 +346,15 @@ static int ParseVideoExtraH264(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
size_t
i_size
=
0
;
uint8_t
*
p_buf
=
h264_avcC_to_AnnexB_NAL
(
p_extra
,
i_extra
,
&
i_size
,
&
p_sys
->
u
.
video
.
i_nal_length_size
);
if
(
p_buf
)
{
H264SetCSD
(
p_dec
,
p_buf
,
i_size
,
NULL
);
free
(
p_buf
);
}
if
(
!
p_buf
)
return
VLC_EGENERIC
;
int
i_ret
=
H264SetCSD
(
p_dec
,
p_buf
,
i_size
,
NULL
);
free
(
p_buf
);
return
i_ret
;
}
else
H264SetCSD
(
p_dec
,
p_extra
,
i_extra
,
NULL
);
return
VLC_SUCCESS
;
return
H264SetCSD
(
p_dec
,
p_extra
,
i_extra
,
NULL
);
}
static
int
ParseVideoExtraHEVC
(
decoder_t
*
p_dec
,
uint8_t
*
p_extra
,
int
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