From ad5e147da2c53f3a0688dd5b97f2ff03a7ccd9c2 Mon Sep 17 00:00:00 2001 From: fryshorts Date: Sat, 15 Feb 2014 13:44:37 +0100 Subject: [PATCH] fixed build problems with older ffmpeg versions changed includes to not use ffmpeg internal headers --- libobs/CMakeLists.txt | 4 ++++ libobs/media-io/audio-resampler-ffmpeg.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index 96587dd53..f2443e9b8 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -8,6 +8,10 @@ find_package(Libavutil REQUIRED) include_directories(${Libavutil_INCLUDE_DIR}) add_definitions(${Libavutil_DEFINITIONS}) +find_package(Libavformat REQUIRED) +include_directories(${Libavformat_INCLUDE_DIR}) +add_definitions(${Libavformat_DEFINITIONS}) + add_definitions(-DLIBOBS_EXPORTS) add_definitions(-DPTW32_STATIC_LIB) diff --git a/libobs/media-io/audio-resampler-ffmpeg.c b/libobs/media-io/audio-resampler-ffmpeg.c index 06f8a9c7e..154cbd764 100644 --- a/libobs/media-io/audio-resampler-ffmpeg.c +++ b/libobs/media-io/audio-resampler-ffmpeg.c @@ -18,8 +18,8 @@ #include "../util/bmem.h" #include "audio-resampler.h" #include "audio-io.h" -#include -#include +#include +#include #include struct audio_resampler {