diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-09-29 21:55:27 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-09-29 21:55:27 -0700 |
| commit | 35e508c6e9462191491ac2c2eae62e60b244d99c (patch) | |
| tree | a60db290bbaa4c8c0684eeaa0241d34ea9b3cb34 /gnuradio-core/src/lib/general/gr_skiphead.cc | |
| parent | 91d630638d6cbe237f0fa1a978f3161a9a041895 (diff) | |
| parent | 65ea256f8de15b7a23c602f9775edf0636b3732c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib/general/gr_skiphead.cc')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_skiphead.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_skiphead.cc b/gnuradio-core/src/lib/general/gr_skiphead.cc index e9dad8fab8..c93478597b 100644 --- a/gnuradio-core/src/lib/general/gr_skiphead.cc +++ b/gnuradio-core/src/lib/general/gr_skiphead.cc @@ -68,14 +68,14 @@ gr_skiphead::reset() int gr_skiphead::general_work(int noutput_items, - gr_vector_int &ninput_items_ignored, + gr_vector_int &ninput_items_, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - int ninput_items = noutput_items; // we've got at least this many input items + int ninput_items = std::min(ninput_items_[0], noutput_items); int ii = 0; // input index while (ii < ninput_items){ |