Properly initialize x264_picture_t in libx264.

Bump libx264 version requirement accordingly.

Originally committed as revision 23430 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 454ac8c99074ce8bbba67d84c1079506c737e37c..cfbe70d4100a518deaf1baa5cf519d68b6e6d8be 100755 (executable)
--- a/configure
+++ b/configure
@@ -2625,8 +2625,8 @@ enabled libtheora  && require  libtheora theora/theoraenc.h th_info_init -ltheor
 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
 

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 2d84dc33af21efe1feecb01265616427370efa72..8387f41286712b9a13cc84f7e49551c43c20d322 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -89,6 +89,7 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
     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;