linuxdvb: work around bug in gcc <4.6. Fixes #1869

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
index 78acb203c13824bacf8b1aaf394f38cc641ec30e..49a4328aa66a1e425e99ff46f0d4ad9c3b887bff 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
@@ -160,84 +160,108 @@ linuxdvb_lnb_bandstack_tune
 
 struct linuxdvb_lnb_conf linuxdvb_lnb_all[] = {
   {
-    .ld_type    = "Universal",
+    { {
+      .ld_type    = "Universal",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    =  9750000,
     .lnb_high   = 10600000,
     .lnb_switch = 11700000,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "Standard",
+    { {
+      .ld_type    = "Standard",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    = 10000000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "Enhanced",
+    { {
+      .ld_type    = "Enhanced",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    =  9750000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "C-Band",
+    { {
+      .ld_type    = "C-Band",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    =  5150000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "Circular 10750",
+    { {
+      .ld_type    = "Circular 10750",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    = 10750000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "Ku 11300",
+    { {
+      .ld_type    = "Ku 11300",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    = 11300000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "DBS",
+    { {
+      .ld_type    = "DBS",
+      .ld_tune    = linuxdvb_lnb_standard_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_standard_freq,
+      .lnb_band   = linuxdvb_lnb_standard_band,
+      .lnb_pol    = linuxdvb_lnb_standard_pol,
+    },
     .lnb_low    = 11250000,
     .lnb_high   = 0,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_standard_freq,
-    .lnb_band   = linuxdvb_lnb_standard_band,
-    .lnb_pol    = linuxdvb_lnb_standard_pol,
-    .ld_tune    = linuxdvb_lnb_standard_tune,
   },
   {
-    .ld_type    = "DBS Bandstack",
+    { {
+      .ld_type    = "DBS Bandstack",
+      .ld_tune    = linuxdvb_lnb_bandstack_tune,
+      },
+      .lnb_freq   = linuxdvb_lnb_bandstack_freq,
+      .lnb_band   = linuxdvb_lnb_bandstack_band,
+      .lnb_pol    = linuxdvb_lnb_bandstack_pol,
+    },
     .lnb_low    = 11250000,
     .lnb_high   = 14350000,
     .lnb_switch = 0,
-    .lnb_freq   = linuxdvb_lnb_bandstack_freq,
-    .lnb_band   = linuxdvb_lnb_bandstack_band,
-    .lnb_pol    = linuxdvb_lnb_bandstack_pol,
-    .ld_tune    = linuxdvb_lnb_bandstack_tune,
   },
 };