summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib/general
diff options
context:
space:
mode:
authorgnychis2009-01-17 04:39:52 +0000
committergnychis2009-01-17 04:39:52 +0000
commit3318308900dff9b1140a47b3e798ab5a14e9bae3 (patch)
tree89c23747f8d9ae706bf9a1595f2378c5bf04483f /gnuradio-core/src/lib/general
parentc3f5183d1383a2fb029bf2a77555499ebf0530ff (diff)
downloadgnuradio-3318308900dff9b1140a47b3e798ab5a14e9bae3.tar.gz
gnuradio-3318308900dff9b1140a47b3e798ab5a14e9bae3.tar.bz2
gnuradio-3318308900dff9b1140a47b3e798ab5a14e9bae3.zip
merging r10246:10247 from developer branch to fix manual frequency setting problem
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10248 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/general')
-rw-r--r--gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
index fdf82667a..dd46bbea4 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
+++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
@@ -130,7 +130,7 @@ gr_clock_recovery_mm_ff::general_work (int noutput_items,
}
}
- consume_each (ii);
+// consume_each (ii);
- return noutput_items;
+ return ii; //noutput_items;
}