[FFmpeg-cvslog] r23430 - in trunk: configure libavcodec/libx264.c

[darkshikari]

Author: darkshikari
Date: Wed Jun  2 22:05:27 2010
New Revision: 23430

Log:
Properly initialize x264_picture_t in libx264.
Bump libx264 version requirement accordingly.

Modified:
   trunk/configure
   trunk/libavcodec/libx264.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Jun  2 20:56:19 2010	(r23429)
+++ trunk/configure	Wed Jun  2 22:05:27 2010	(r23430)
@@ -2625,8 +2625,8 @@ enabled libtheora  && require  libtheora
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
 enabled libvpx     && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx
 enabled libx264    && require  libx264 x264.h x264_encoder_encode -lx264 -lm &&
-                      { check_cpp_condition x264.h "X264_BUILD >= 90" ||
-                        die "ERROR: libx264 version must be >= 0.90."; }
+                      { check_cpp_condition x264.h "X264_BUILD >= 98" ||
+                        die "ERROR: libx264 version must be >= 0.98."; }
 enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
 enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 

Modified: trunk/libavcodec/libx264.c
==============================================================================
--- trunk/libavcodec/libx264.c	Wed Jun  2 20:56:19 2010	(r23429)
+++ trunk/libavcodec/libx264.c	Wed Jun  2 22:05:27 2010	(r23430)
@@ -89,6 +89,7 @@ static int X264_frame(AVCodecContext *ct
     int nnal, i;
     x264_picture_t pic_out;
 
+    x264_picture_init( &x4->pic );
     x4->pic.img.i_csp   = X264_CSP_I420;
     x4->pic.img.i_plane = 3;