From 623b0a77e1cf723c72104d97ca0a3094aa72c73c Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <o.freyermuth@googlemail.com>
Date: Sat, 28 Feb 2015 04:51:05 +0100
Subject: stream_dvb: Always define NO_STREAM_ID_FILTER if missing.

It is also used for initialization in channel-list setup.
Should fix compilation on FreeBSD, and is more correct
since it is used unconditionally.
Reverts 6445648 .

(cherry picked from commit 40c9e7906831e67ad3b83324d5a95f4c8a869b9e)
---
 stream/dvbin.h           | 2 +-
 waftools/fragments/dvb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stream/dvbin.h b/stream/dvbin.h
index 5dfb20c548..baa7ba4e13 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -37,12 +37,12 @@
 #ifndef DTV_STREAM_ID
 #define DTV_STREAM_ID DTV_ISDBS_TS_ID
 #endif
+#endif
 
 // This is only defined, for convenience, since API 5.8.
 #ifndef NO_STREAM_ID_FILTER
 #define NO_STREAM_ID_FILTER (~0U)
 #endif
-#endif
 
 #if (DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5
 #define DVB_ATSC 1
diff --git a/waftools/fragments/dvb.c b/waftools/fragments/dvb.c
index f30350c75c..9deaa1eaab 100644
--- a/waftools/fragments/dvb.c
+++ b/waftools/fragments/dvb.c
@@ -7,4 +7,4 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
-int main(void) {int a = NO_STREAM_ID_FILTER; return 0;}
+int main(void) {return 0;}
-- 
cgit v1.2.3