summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Freyermuth <o.freyermuth@googlemail.com>2015-02-28 04:51:05 +0100
committerwm4 <wm4@nowhere>2015-02-28 18:27:21 +0100
commit40c9e7906831e67ad3b83324d5a95f4c8a869b9e (patch)
treefc0c189eac4cf276df8dedbcf1d5db418455e6de
parent03a69bac95ce4e15016138104cd198a6a60c38cd (diff)
downloadmpv-40c9e7906831e67ad3b83324d5a95f4c8a869b9e.tar.bz2
mpv-40c9e7906831e67ad3b83324d5a95f4c8a869b9e.tar.xz
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 .
-rw-r--r--stream/dvbin.h2
-rw-r--r--waftools/fragments/dvb.c2
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;}