From: Ilkka Ollakka <ileoo@videolan.org>
Date: Wed, 2 Jun 2010 20:10:51 +0000 (+0300)
Subject: x264: use x264_picture_init from X264_BUILD >= 98
X-Git-Tag: 1.2.0-pre1~6335
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=aa34b13d14c5fe5a5b5abdf0010aace03f7a7d70;p=vlc

x264: use x264_picture_init from X264_BUILD >= 98
---

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 029ee5b56b..29ad78b509 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1269,7 +1269,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
     int i_nal=0, i_out=0, i=0;
 
     /* init pic */
+#if X264_BUILD >= 98
+    x264_picture_init( &pic );
+#else
     memset( &pic, 0, sizeof( x264_picture_t ) );
+#endif
     if( likely(p_pict) ) {
        pic.i_pts = p_pict->date;
        pic.img.i_csp = X264_CSP_I420;