Skip to content

V
vlc-2-2
Commit b5263f9c authored by Pavlov Konstantin's avatar Pavlov Konstantin
Browse files
Options

Fix builds with dirac >= 0.9.0, require it as well.

parent b6ca26bb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
configure.ac
View file @ b5263f9c
...@@ -3692,7 +3692,7 @@ dnl ...@@ -3692,7 +3692,7 @@ dnl
AC_ARG_ENABLE(dirac, AC_ARG_ENABLE(dirac,
[ --enable-dirac experimental dirac codec (default disabled)]) [ --enable-dirac experimental dirac codec (default disabled)])
if test "${enable_dirac}" = "yes"; then if test "${enable_dirac}" = "yes"; then
PKG_CHECK_MODULES(DIRAC,[dirac >= 0.8.0], [ PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [
VLC_ADD_PLUGINS([dirac]) VLC_ADD_PLUGINS([dirac])
VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
......
modules/codec/dirac.c
View file @ b5263f9c
...@@ -173,7 +173,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec ) ...@@ -173,7 +173,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec )
p_pic = p_dec->pf_vout_buffer_new( p_dec ); p_pic = p_dec->pf_vout_buffer_new( p_dec );
if( p_pic == NULL ) return NULL; if( p_pic == NULL ) return NULL;
p_pic->b_progressive = !p_sys->p_dirac->src_params.interlace; p_pic->b_progressive = !p_sys->p_dirac->src_params.source_sampling;
p_pic->b_top_field_first = p_sys->p_dirac->src_params.topfieldfirst; p_pic->b_top_field_first = p_sys->p_dirac->src_params.topfieldfirst;
p_pic->i_nb_fields = 2; p_pic->i_nb_fields = 2;
...@@ -368,7 +368,7 @@ static int OpenEncoder( vlc_object_t *p_this ) ...@@ -368,7 +368,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc->fmt_in.video.i_frame_rate; p_enc->fmt_in.video.i_frame_rate;
p_sys->ctx.src_params.frame_rate.denominator = p_sys->ctx.src_params.frame_rate.denominator =
p_enc->fmt_in.video.i_frame_rate_base; p_enc->fmt_in.video.i_frame_rate_base;
p_sys->ctx.src_params.interlace = 0; p_sys->ctx.src_params.source_sampling = 0;
p_sys->ctx.src_params.topfieldfirst = 0; p_sys->ctx.src_params.topfieldfirst = 0;
var_Get( p_enc, ENC_CFG_PREFIX "quality", &val ); var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
......
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