Commit 7cf05804 authored by Adrien Maglo's avatar Adrien Maglo Committed by Jean-Baptiste Kempf
Browse files

Fix a segfault : check the return value of x264_encoder_open().



According to x264 code, if it fails, it return NULL.
And with a first NULL parameter x264_encoder_headers() segfaults.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 77dea4efed8f1ce11edf551ac33b53ead9fb16a8)
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1d7a69b1
......@@ -1303,6 +1303,12 @@ static int Open ( vlc_object_t *p_this )
/* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param );
if( p_sys->h == NULL )
{
msg_Err( p_enc, "cannot open x264 encoder" );
return VLC_EGENERIC;
}
/* alloc mem */
p_sys->i_buffer = 4 * p_enc->fmt_in.video.i_width *
p_enc->fmt_in.video.i_height + 1000;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment