diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-06 22:02:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-06 22:02:01 -0700 |
| commit | a82dcf4cccd48d54c79d81689a821a6fc345f9c2 (patch) | |
| tree | 4f5ab470798d866268b011dd6075a1becd265548 /gr-dtv | |
| parent | ca38efec194f7d4e437a294838268a2ccdf609e9 (diff) | |
| parent | b7a38bf8e27d502cb27a37da1c9c187e1140d1ab (diff) | |
Merge branch 'next' into python3
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 7 |
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)); |