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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Jun  2 23:15:45 2010 +0300| [de82b757e73fbfebc57761e160dc8274dcda9923] | committer: Ilkka Ollakka 

x264: use x264_picture_init() from X264_BUILD >= 98

(cherry picked from commit aa34b13d14c5fe5a5b5abdf0010aace03f7a7d70)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

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

 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 5af518e..b7f138a 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1306,7 +1306,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
     int i_nal, i_out, i;
 
     /* init pic */
+#if X264_BUILD >= 98
+    x264_picture_init( &pic );
+#else
     memset( &pic, 0, sizeof( x264_picture_t ) );
+#endif
     pic.i_pts = p_pict->date;
     pic.img.i_csp = X264_CSP_I420;
     pic.img.i_plane = p_pict->i_planes;