[ffmpeg] Ported 2.0.7 ffmpeg producer to 2.1.0 while still keeping the usage of the...

[casparcg] / modules / ffmpeg / CMakeLists.txt

diff --git a/modules/ffmpeg/CMakeLists.txt b/modules/ffmpeg/CMakeLists.txt
index 939d5edc5d2862b05cda02679b6d6beaa5ee4615..6b8172acfb2854d0faaa0757a137cc72e8a19aae 100644 (file)
--- a/modules/ffmpeg/CMakeLists.txt
+++ b/modules/ffmpeg/CMakeLists.txt
@@ -7,6 +7,7 @@ set(SOURCES
 
                producer/audio/audio_decoder.cpp
 
+               producer/filter/audio_filter.cpp
                producer/filter/filter.cpp
 
                producer/input/input.cpp
@@ -21,6 +22,7 @@ set(SOURCES
                producer/ffmpeg_producer.cpp
                producer/tbb_avcodec.cpp
 
+               audio_channel_remapper.cpp
                ffmpeg.cpp
                ffmpeg_error.cpp
                StdAfx.cpp
@@ -31,6 +33,7 @@ set(HEADERS
 
                producer/audio/audio_decoder.h
 
+               producer/filter/audio_filter.h
                producer/filter/filter.h
 
                producer/input/input.h
@@ -82,6 +85,7 @@ if (MSVC)
                        avcodec.lib
                        avutil.lib
                        avfilter.lib
+                       avdevice.lib
                        swscale.lib
                        swresample.lib
        )
@@ -95,6 +99,7 @@ else()
                        avcodec.so
                        avutil.so
                        avfilter.so
+                       avdevice.so
                        swscale.so
                        swresample.so
                        postproc.so
@@ -120,12 +125,10 @@ else()
                        rtmp
                        ssl
                        tasn1
-                       theora
                        theoradec
                        theoraenc
                        vorbis
                        vorbisenc
-                       vorbisfile
                        vpx
                        x264
                        xavs