From c70b54d49bd2c66becd708f22d210244b13c7a94 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 25 Nov 2009 15:02:52 +0100
Subject: [PATCH] Easy switch between FRSH and non-FRSH version of FFMPEG

---
 Makefile.omk | 8 ++++----
 streamer.c   | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.omk b/Makefile.omk
index b09c9ba..bfa0b59 100644
--- 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 e794e9a..c046e19 100644
--- 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;
-- 
2.39.2