ffmpeg | branch: master | Carl Eugen Hoyos <[email protected]> | Sat Oct 4 17:42:45 2014 +0200| [aaf65bc2a5cb0176bdb47b17d20554a69ef49d07] | committer: Carl Eugen Hoyos
lavc/libx264: Fix compilation with libx264 version < 142. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aaf65bc2a5cb0176bdb47b17d20554a69ef49d07 --- libavcodec/libx264.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 7839248..5952a0d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -533,7 +533,12 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_vfr_input = 0; } if (x4->avcintra_class >= 0) +#if X264_BUILD >= 142 x4->params.i_avcintra_class = x4->avcintra_class; +#else + av_log(avctx, AV_LOG_ERROR, + "x264 too old for AVC Intra, at least version 142 needed\n"); +#endif if (x4->b_bias != INT_MIN) x4->params.i_bframe_bias = x4->b_bias; if (x4->b_pyramid >= 0) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
