Attachment #6361 for bug #30989

View | Details | Raw Unified | Return to bug 30989
Collapse All | Expand All

Lines 53-61 file(GLOB FFMPEG_BIN_FILES Link Here

(-)a/cmake/Modules/CopyMSVCBins.cmake (-4 / +3 lines)
53	"${FFMPEG_swscale_INCLUDE_DIR}/bin${_bin_suffix}/swscale-*.dll"	53	"${FFMPEG_swscale_INCLUDE_DIR}/bin${_bin_suffix}/swscale-*.dll"
54	"${FFMPEG_swscale_INCLUDE_DIR}/../bin${_bin_suffix}/swscale-*.dll"	54	"${FFMPEG_swscale_INCLUDE_DIR}/../bin${_bin_suffix}/swscale-*.dll"
55		55
56	"${FFMPEG_swresample_INCLUDE_DIR}/../bin/swresample-*.dll"	56	"${FFMPEG_avresample_INCLUDE_DIR}/../bin/avresample-*.dll"
57	"${FFMPEG_swresample_INCLUDE_DIR}/../bin${_bin_suffix}/swresample-*.dll"	57	"${FFMPEG_avresample_INCLUDE_DIR}/../bin${_bin_suffix}/avresample-*.dll"
58	"${FFMPEG_swresample_INCLUDE_DIR}/bin${_bin_suffix}/swresample-*.dll"	58	"${FFMPEG_avresample_INCLUDE_DIR}/bin${_bin_suffix}/avresample-*.dll"
59		59
60	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libopus*.dll"	60	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libopus*.dll"
61	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/opus*.dll"	61	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/opus*.dll"
62	----------------- obs-studio/cmake/Modules/FindFFmpeg.cmake ------------------

Lines 134-141 foreach(component ${FFmpeg_FIND_COMPONENTS}) Link Here

(-)a/CCallback.cpp (-3 / +2 lines)
134	find_ffmpeg_library("${component}" "avutil.h")	134	find_ffmpeg_library("${component}" "avutil.h")
135	elseif(component STREQUAL "postproc")	135	elseif(component STREQUAL "postproc")
136	find_ffmpeg_library("${component}" "postprocess.h")	136	find_ffmpeg_library("${component}" "postprocess.h")
137	elseif(component STREQUAL "swresample")	137	elseif(component STREQUAL "avresample")
138	find_ffmpeg_library("${component}" "swresample.h")	138	find_ffmpeg_library("${component}" "avresample.h")
139	elseif(component STREQUAL "swscale")	139	elseif(component STREQUAL "swscale")
140	find_ffmpeg_library("${component}" "swscale.h")	140	find_ffmpeg_library("${component}" "swscale.h")
141	else()	141	else()
142	-------------------- obs-studio/deps/libff/CMakeLists.txt ---------------------

Lines 2-8 cmake_minimum_required (VERSION 2.8.11) Link Here

(-)a/CCallback.cpp (-2 / +1 lines)
2	project (libff)	2	project (libff)
3		3
4	find_package(FFmpeg REQUIRED	4	find_package(FFmpeg REQUIRED
5	COMPONENTS avcodec avfilter avdevice avutil swscale avformat swresample)	5	COMPONENTS avcodec avfilter avdevice avutil swscale avformat avresample)
6		6
7	include_directories(${FFMPEG_INCLUDE_DIRS})	7	include_directories(${FFMPEG_INCLUDE_DIRS})
8		8
9	---------------------- obs-studio/libobs/CMakeLists.txt -----------------------

Lines 3-9 project(libobs) Link Here

(-)a/CCallback.cpp (-2 / +1 lines)
3	find_package(Threads REQUIRED)	3	find_package(Threads REQUIRED)
4		4
5	find_package(FFmpeg REQUIRED	5	find_package(FFmpeg REQUIRED
6	COMPONENTS avformat avutil swscale swresample	6	COMPONENTS avformat avutil swscale avresample
7	OPTIONAL_COMPONENTS avcodec)	7	OPTIONAL_COMPONENTS avcodec)
8	include_directories(${FFMPEG_INCLUDE_DIRS})	8	include_directories(${FFMPEG_INCLUDE_DIRS})
9		9
10	------------ obs-studio/libobs/media-io/audio-resampler-ffmpeg.c -------------

Lines 20-26 Link Here

(-)a/CCallback.cpp (-2 / +1 lines)
20	#include "audio-io.h"	20	#include "audio-io.h"
21	#include <libavutil/avutil.h>	21	#include <libavutil/avutil.h>
22	#include <libavformat/avformat.h>	22	#include <libavformat/avformat.h>
23	#include <libswresample/swresample.h>	23	#include <libavresample/avresample.h>
24		24
25	struct audio_resampler {	25	struct audio_resampler {
26	struct SwrContext *context;	26	struct SwrContext *context;
27	---------------- obs-studio/plugins/obs-ffmpeg/CMakeLists.txt -----------------

Lines 6-12 if(MSVC) Link Here

(-)a/CCallback.cpp (-1 / +1 lines)
6	endif()	6	endif()
7		7
8	find_package(FFmpeg REQUIRED	8	find_package(FFmpeg REQUIRED
9	COMPONENTS avcodec avfilter avdevice avutil swscale avformat swresample)	9	COMPONENTS avcodec avfilter avdevice avutil swscale avformat avresample)
10	include_directories(${FFMPEG_INCLUDE_DIRS})	10	include_directories(${FFMPEG_INCLUDE_DIRS})
11		11
12	set(obs-ffmpeg_HEADERS	12	set(obs-ffmpeg_HEADERS

Lines 15-20 Link Here

(-)a/deps/libff/libff/ff-circular-queue.c (+1 lines)
15	*/	15	*/
16		16
17	#include "ff-circular-queue.h"	17	#include "ff-circular-queue.h"
		18	#include <string.h>
18		19
19	static void queue_fetch_or_alloc(struct ff_circular_queue cq,	20	static void queue_fetch_or_alloc(struct ff_circular_queue cq,
20	int index)	21	int index)

Return to bug 30989