jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Buildfix for older FFmpeg versions (F20 RPMFusion)

Browse Source
This commit is contained in:
Ethan Lee 2015-04-01 06:50:22 -04:00
parent 453b505637
commit fd4f2e29aa
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/libff/libff/ff-util.c vendored
View File

@ -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()

2
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@ -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"),