[ffmpeg_consumer] Retired old implementation in favour of the now updated streaming_c...

[casparcg] / modules / ffmpeg / CMakeLists.txt

diff --git a/modules/ffmpeg/CMakeLists.txt b/modules/ffmpeg/CMakeLists.txt
index 939d5edc5d2862b05cda02679b6d6beaa5ee4615..7c34f72f4378c768136447683919fd2673b50615 100644 (file)
--- a/modules/ffmpeg/CMakeLists.txt
+++ b/modules/ffmpeg/CMakeLists.txt
@@ -3,10 +3,10 @@ project (ffmpeg)
 
 set(SOURCES
                consumer/ffmpeg_consumer.cpp
-               consumer/streaming_consumer.cpp
 
                producer/audio/audio_decoder.cpp
 
+               producer/filter/audio_filter.cpp
                producer/filter/filter.cpp
 
                producer/input/input.cpp
@@ -21,16 +21,17 @@ set(SOURCES
                producer/ffmpeg_producer.cpp
                producer/tbb_avcodec.cpp
 
+               audio_channel_remapper.cpp
                ffmpeg.cpp
                ffmpeg_error.cpp
                StdAfx.cpp
 )
 set(HEADERS
                consumer/ffmpeg_consumer.h
-               consumer/streaming_consumer.h
 
                producer/audio/audio_decoder.h
 
+               producer/filter/audio_filter.h
                producer/filter/filter.h
 
                producer/input/input.h
@@ -82,6 +83,7 @@ if (MSVC)
                        avcodec.lib
                        avutil.lib
                        avfilter.lib
+                       avdevice.lib
                        swscale.lib
                        swresample.lib
        )
@@ -95,6 +97,7 @@ else()
                        avcodec.so
                        avutil.so
                        avfilter.so
+                       avdevice.so
                        swscale.so
                        swresample.so
                        postproc.so
@@ -120,12 +123,10 @@ else()
                        rtmp
                        ssl
                        tasn1
-                       theora
                        theoradec
                        theoraenc
                        vorbis
                        vorbisenc
-                       vorbisfile
                        vpx
                        x264
                        xavs