generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/libx264: Fix compilation with libx264 version < 142.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2014-10-04 17:42:45 +02:00
parent 9734a7a1de
commit aaf65bc2a5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/libx264.c
View File

@ -533,7 +533,12 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.b_vfr_input = 0; x4->params.b_vfr_input = 0;
} }
if (x4->avcintra_class >= 0) if (x4->avcintra_class >= 0)
#if X264_BUILD >= 142
x4->params.i_avcintra_class = x4->avcintra_class; 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) if (x4->b_bias != INT_MIN)
x4->params.i_bframe_bias = x4->b_bias; x4->params.i_bframe_bias = x4->b_bias;
if (x4->b_pyramid >= 0) if (x4->b_pyramid >= 0)