Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-core / src / lib / filter / gr_freq_xlating_fir_filter_ccc.cc

diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc
index 88f6cf24a6ebf78a04e03351a5579b0a131954e4..a27bc1e80f506e71ee87e4d1196d57506959f881 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc
+++ b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc
@@ -6,7 +6,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -110,6 +110,7 @@ gr_freq_xlating_fir_filter_ccc::work (int noutput_items,
     set_history (d_proto_taps.size ());
     build_composite_fir ();
     d_updated = false;
+    return 0;               // history requirements may have changed.
   }
 
   unsigned j = 0;