Fix compile errors in non-frsh build

diff --git a/build/Makefile.omk b/build/Makefile.omk
index 8a57bc302f93d0f90576239126bc6aa57f437e3c..c124e31160042e3aa9c4381c8bbe2719838aa574 100644 (file)
--- a/build/Makefile.omk
+++ b/build/Makefile.omk
@@ -1,4 +1,4 @@
-SUBDIRS=$(sort $(ALL_OMK_SUBDIRS) ffmpeg wvtest/c)
+SUBDIRS=$(sort $(ALL_OMK_SUBDIRS) ffmpeg $(wildcard wvtest/c))
 
 test: run_diff
 

diff --git a/src/recorder/ffmpeg.c b/src/recorder/ffmpeg.c
index 27b5bc047ee744685a1979257c9bff2a2da5713d..10a1897fa7a94be1b17a3da4f7421dddc8c9a655 100644 (file)
--- a/src/recorder/ffmpeg.c
+++ b/src/recorder/ffmpeg.c
@@ -65,6 +65,8 @@
 
 #ifdef CONFIG_FFMPEG_WITH_FRSH
 #include <frsh.h>
+extern frsh_vres_id_t last_rtp_vres;
+extern frsh_contract_t last_rtp_contract;
 #endif
 
 #include "cmdutils.h"
@@ -74,10 +76,6 @@
 
 #undef exit
 
-extern frsh_vres_id_t last_rtp_vres;
-extern frsh_contract_t last_rtp_contract;
-
-
 const char program_name[] = "FFmpeg";
 const int program_birth_year = 2000;