From fd4f2e29aa2edbbb093b693272d7cec56485449d Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Wed, 1 Apr 2015 06:50:22 -0400 Subject: [PATCH] Buildfix for older FFmpeg versions (F20 RPMFusion) --- deps/libff/libff/ff-util.c | 4 ++++ plugins/obs-ffmpeg/obs-ffmpeg-source.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/deps/libff/libff/ff-util.c b/deps/libff/libff/ff-util.c index 557e10d6b..de9b88b7f 100644 --- a/deps/libff/libff/ff-util.c +++ b/deps/libff/libff/ff-util.c @@ -251,6 +251,7 @@ static inline bool is_output_device(const AVClass *avclass) if (!avclass) return 0; +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 66, 101) switch (avclass->category) { case AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT: case AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT: @@ -259,6 +260,9 @@ static inline bool is_output_device(const AVClass *avclass) default: return false; } +#else + return (avclass->category == AV_CLASS_CATEGORY_OUTPUT); +#endif } const struct ff_format_desc *ff_format_supported() diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c index e9a761e4a..facda5c6f 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c @@ -404,8 +404,10 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data) AVDISCARD_NONREF); obs_property_list_add_int(prop, obs_module_text("DiscardBiDir"), AVDISCARD_BIDIR); +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 67, 100) obs_property_list_add_int(prop, obs_module_text("DiscardNonIntra"), AVDISCARD_NONINTRA); +#endif obs_property_list_add_int(prop, obs_module_text("DiscardNonKey"), AVDISCARD_NONKEY); obs_property_list_add_int(prop, obs_module_text("DiscardAll"),