mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-27 15:48:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from fryshorts/master

Browse Source 
fix ffmpeg includes
This commit is contained in:
Jim
2014-02-16 08:28:09 -07:00
parent 1570fa75b9 ad5e147da2
commit fc368f663e
2 changed files with 6 additions and 2 deletions
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})
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)

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

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