You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.1 KiB
30 lines
1.1 KiB
12 years ago
|
commit a1f6bd08356a7ab76655a54362511db6e54646c9
|
||
|
|
Author: Rémi Denis-Courmont <remi@remlab.net>
|
||
|
|
Date: Sat Nov 24 17:49:43 2012 +0200
|
||
|
|
|
||
|
|
dtv: fix compilation with Linux 3.7 / DVB >= 5.8 (fixes #7763)
|
||
|
|
|
||
|
|
(cherry picked from commit cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b)
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
modules/access/dtv/linux.c
|
||
|
|
|
||
|
|
diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
|
||
|
|
index b349365..bf4215c 100644
|
||
|
|
--- a/modules/access/dtv/linux.c
|
||
|
|
+++ b/modules/access/dtv/linux.c
|
||
|
|
@@ -917,7 +917,12 @@ int dvb_set_isdbs (dvb_device_t *d, uint64_t freq_Hz, uint16_t ts_id)
|
||
|
|
return -1;
|
||
|
|
return dvb_set_props (d, 5, DTV_CLEAR, 0, DTV_DELIVERY_SYSTEM, SYS_ISDBS,
|
||
|
|
DTV_FREQUENCY, freq,
|
||
|
|
- DTV_ISDBS_TS_ID, (uint32_t)ts_id);
|
||
|
|
+#if DVBv5(8)
|
||
|
|
+ DTV_STREAM_ID,
|
||
|
|
+#else
|
||
|
|
+ DTV_ISDBS_TS_ID,
|
||
|
|
+#endif
|
||
|
|
+ (uint32_t)ts_id);
|
||
|
|
#else
|
||
|
|
# warning ISDB-S needs Linux DVB version 5.1 or later.
|
||
|
|
msg_Err (d->obj, "ISDB-S support not compiled-in");
|