From: Pavlov Konstantin <thresh@videolan.org>
Date: Mon, 28 Jan 2008 19:58:10 +0000 (+0000)
Subject: Fix builds with dirac >= 0.9.0, require it as well.
X-Git-Tag: 0.9.0-test0~3111
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b5263f9cf9d94b558502fa932c8e5f053915e6ff;p=vlc

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

diff --git a/configure.ac b/configure.ac
index 069a5a2892..684ea97d00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3692,7 +3692,7 @@ dnl
 AC_ARG_ENABLE(dirac,
 [  --enable-dirac          experimental dirac codec (default disabled)])
 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_CFLAGS([dirac],[$DIRAC_CFLAGS])
       VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 4572018d6c..78d35ba541 100644
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -173,7 +173,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec )
     p_pic = p_dec->pf_vout_buffer_new( p_dec );
 
     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->i_nb_fields = 2;
@@ -368,7 +368,7 @@ static int OpenEncoder( vlc_object_t *p_this )
         p_enc->fmt_in.video.i_frame_rate;
     p_sys->ctx.src_params.frame_rate.denominator =
         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;
 
     var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );