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

fixed build problems with older ffmpeg versions 

changed includes to not use ffmpeg internal headers
master
fryshorts 2014-02-15 13:44:37 +01:00
parent 1570fa75b9
commit ad5e147da2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/CMakeLists.txt
View File

@ -8,6 +8,10 @@ find_package(Libavutil REQUIRED)
include_directories(${Libavutil_INCLUDE_DIR}) include_directories(${Libavutil_INCLUDE_DIR})
add_definitions(${Libavutil_DEFINITIONS}) add_definitions(${Libavutil_DEFINITIONS})
find_package(Libavformat REQUIRED)
include_directories(${Libavformat_INCLUDE_DIR})
add_definitions(${Libavformat_DEFINITIONS})
add_definitions(-DLIBOBS_EXPORTS) add_definitions(-DLIBOBS_EXPORTS)
add_definitions(-DPTW32_STATIC_LIB) add_definitions(-DPTW32_STATIC_LIB)

4
libobs/media-io/audio-resampler-ffmpeg.c
View File

@ -18,8 +18,8 @@
#include "../util/bmem.h" #include "../util/bmem.h"
#include "audio-resampler.h" #include "audio-resampler.h"
#include "audio-io.h" #include "audio-io.h"
#include <libavutil/opt.h> #include <libavutil/avutil.h>
#include <libavutil/channel_layout.h> #include <libavformat/avformat.h>
#include <libswresample/swresample.h> #include <libswresample/swresample.h>
struct audio_resampler { struct audio_resampler {