Easy switch between FRSH and non-FRSH version of FFMPEG

diff --git a/Makefile.omk b/Makefile.omk
index b09c9baa6013b5e020bf5e6c44ba6d2c2a21b21b..bfa0b59f65f1c1999cb7f3aa5d8c0768d6046e29 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,4 +1,4 @@
-default_CONFIG += CONFIG_STREAMER_WITH_FRSH=y
+default_CONFIG += CONFIG_FFMPEG_WITH_FRSH=x
 default_CONFIG += CONFIG_AQUOSA=x
 default_CONFIG += CONFIG_OC_ULUT=x
 default_CONFIG += FRSH_CPU_ID_DEFAULT=x
@@ -23,7 +23,7 @@ bin_PROGRAMS=streamer
 streamer_SOURCES=streamer.c input.c codec.c output.c
 
 lib_LOADLIBES+= postproc swscale avfilter avdevice avformat avcodec avutil m z pthread
-lib_LOADLIBES+= z bz2 m asound jack dl asound jack asound
-ifeq ($(CONFIG_STREAMER_WITH_FRSH),y)
+lib_LOADLIBES+= z bz2 m asound jack dl asound jack asound ulut
+ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
 lib_LOADLIBES+= pthread rt fwp fna frsh
-endif
\ No newline at end of file
+endif

diff --git a/streamer.c b/streamer.c
index e794e9a514d8d5e08759c4994bd8702d386d562d..c046e19c4da9a3ce1ae45e509e5a447d4d724e03 100644 (file)
--- a/streamer.c
+++ b/streamer.c
@@ -5,6 +5,8 @@
  */
 #include <unistd.h>
 #include <stdlib.h>
+#include <signal.h>
+#include <pthread.h>
 
 #include <libavformat/avformat.h>
 #include <libavdevice/avdevice.h>
@@ -218,7 +220,7 @@ int main(int argc, char *argv[])
   dump_format(os, 0, os->filename, 1);
   sdp_print(os, sdp_file);
 
-#ifdef CONFIG_AQUOSA 
+#if CONFIG_STREAMER_WITH_FRSH && CONFIG_AQUOSA 
   frsh_thread_attr_t frsh_attr;
   frsh_thread_id_t thread;
   frsh_vres_id_t cpu_vres;