From 58d478c0391464b3c7f3cb4536007579fd2842dd Mon Sep 17 00:00:00 2001 From: Darrell Walisser Date: Fri, 26 Jan 2018 12:13:54 -0500 Subject: [PATCH] Update for FFmpeg 3.5 --- src/FFmpeg.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 6b8da4a71..81b714a58 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -130,9 +130,15 @@ extern "C" { #endif #if LIBAVCODEC_VERSION_MAJOR < 58 - #define AV_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE - #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER - #define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME + #ifndef AV_CODEC_FLAG_QSCALE + #define AV_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE + #endif + #ifndef AV_CODEC_FLAG_GLOBAL_HEADER + #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER + #endif + #ifndef AV_CODEC_CAP_SMALL_LAST_FRAME + #define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME + #endif #endif }