Now FFmpeg requires openh264 at least at version 1.6. --- libavcodec/libopenh264enc.c | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 0c1b1b8..ec78b12 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -45,10 +45,6 @@ typedef struct SVCContext { int cabac; } SVCContext; -#define OPENH264_VER_AT_LEAST(maj, min) \ - ((OPENH264_MAJOR > (maj)) || \ - (OPENH264_MAJOR == (maj) && OPENH264_MINOR >= (min))) - #define OFFSET(x) offsetof(SVCContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -165,11 +161,7 @@ FF_ENABLE_DEPRECATION_WARNINGS param.bEnableLongTermReference = 0; param.iLtrMarkPeriod = 30; param.uiIntraPeriod = avctx->gop_size; -#if OPENH264_VER_AT_LEAST(1, 4) param.eSpsPpsIdStrategy = CONSTANT_ID; -#else - param.bEnableSpsPpsIdAddition = 0; -#endif param.bPrefixNalAddingCtrl = 0; param.iLoopFilterDisableIdc = !s->loopfilter; param.iEntropyCodingModeFlag = 0; -- 1.9.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel