Commit 4cb7dfdb authored by darkshikari's avatar darkshikari

Properly initialize x264_picture_t in libx264.

Bump libx264 version requirement accordingly.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23430 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 94d38d9e
...@@ -2625,8 +2625,8 @@ enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheor ...@@ -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 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 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 && enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 90" || { check_cpp_condition x264.h "X264_BUILD >= 98" ||
die "ERROR: libx264 version must be >= 0.90."; } die "ERROR: libx264 version must be >= 0.98."; }
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
......
...@@ -89,6 +89,7 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf, ...@@ -89,6 +89,7 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
int nnal, i; int nnal, i;
x264_picture_t pic_out; x264_picture_t pic_out;
x264_picture_init( &x4->pic );
x4->pic.img.i_csp = X264_CSP_I420; x4->pic.img.i_csp = X264_CSP_I420;
x4->pic.img.i_plane = 3; x4->pic.img.i_plane = 3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment