summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-04-06 22:01:27 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-04-06 22:01:27 -0700
commitcb7603c2271673a4f4f0f13f14189811e873b760 (patch)
treea760e20cd52f53f8402cb45903306bad6a760e05
parentb163c7e26a61245202e07aa6e5881763ed6acaaf (diff)
parente7cb7213cd4d73f0f093f4dd62406d3de47c1fea (diff)
Merge remote-tracking branch 'gnuradio-github/pr/1264' into maint
-rw-r--r--gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index 1755fc82ca..f4dc7cdf2b 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -903,7 +903,12 @@ namespace gr {
l1_constellation = l1constellation;
t2_frames = t2frames;
t2_frame_num = 0;
- l1_scrambled = l1scrambled;
+ if (version == VERSION_131) {
+ l1_scrambled = l1scrambled;
+ }
+ else {
+ l1_scrambled = FALSE;
+ }
stream_items = cell_size * fecblocks;
if (N_FC == 0) {
set_output_multiple((N_P2 * C_P2) + (numdatasyms * C_DATA));