[vlc-commits] commit: x264: use x264_picture_init from X264_BUILD >= 98 (Ilkka Ollakka )

[git at videolan.org]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Jun  2 23:10:51 2010 +0300| [aa34b13d14c5fe5a5b5abdf0010aace03f7a7d70] | committer: Ilkka Ollakka 

x264: use x264_picture_init from X264_BUILD >= 98

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa34b13d14c5fe5a5b5abdf0010aace03f7a7d70
---

 modules/codec/x264.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 029ee5b..29ad78b 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;