Properly initialize x264_picture_t in libx264.

Bump libx264 version requirement accordingly. Originally committed as revision 23430 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago · 652d9d24dc
parent d04c13f74b
commit 652d9d24dc
2 changed files with 3 additions and 2 deletions
--- a/4
+++ b/4
@ -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

--- 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;