Skip to content

V
vlc-2-2
Commit c5c882ab authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

x264.c: check x264_build around 10-bit and 422/444 handling

parent 42e415b4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
modules/codec/x264.c
View file @ c5c882ab
...@@ -767,14 +767,11 @@ static int Open ( vlc_object_t *p_this ) ...@@ -767,14 +767,11 @@ static int Open ( vlc_object_t *p_this )
p_enc->fmt_in.i_codec = VLC_CODEC_I420; p_enc->fmt_in.i_codec = VLC_CODEC_I420;
p_sys->i_colorspace = X264_CSP_I420; p_sys->i_colorspace = X264_CSP_I420;
#if X264_BUILD >= 118
char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" ); char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
if( psz_profile ) if( psz_profile )
{ {
#if X264_CSP_HIGH_DEPTH const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
#else
int mask = 0;
#endif
if( !strcmp( psz_profile, "high10" ) ) if( !strcmp( psz_profile, "high10" ) )
{ {
p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : VLC_CODEC_I420; p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : VLC_CODEC_I420;
...@@ -792,6 +789,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -792,6 +789,7 @@ static int Open ( vlc_object_t *p_this )
} }
} }
free( psz_profile ); free( psz_profile );
#endif //X264_BUILD
p_enc->pf_encode_video = Encode; p_enc->pf_encode_video = Encode;
p_enc->pf_encode_audio = NULL; p_enc->pf_encode_audio = NULL;
......
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