diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-06-02 20:05:27 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-06-02 20:05:27 +0000 |
| commit | 652d9d24dc83fedfc62836aa3e8b92f5bc8cdb20 (patch) | |
| tree | edf8b85557d3c9484bf0c18394cb013ab3e870b0 | |
| parent | d04c13f74bb9a24d5239f397b0c288c59b296822 (diff) | |
| download | ffmpeg-652d9d24dc83fedfc62836aa3e8b92f5bc8cdb20.tar.gz | |
Properly initialize x264_picture_t in libx264.
Bump libx264 version requirement accordingly.
Originally committed as revision 23430 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/libx264.c | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -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 2d84dc33af..8387f41286 100644 --- 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; |