Ignore:
Timestamp:
Apr 11, 2017, 1:49:44 AM (7 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
sampler
Children:
04d0c89
Parents:
fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • examples/aubiotrack.c

    rfbafd2c rb201912  
    4747    aubio_wavetable_stop ( wavetable );
    4848  }
    49   if (mix_input)
     49  if (mix_input) {
    5050    aubio_wavetable_do (wavetable, ibuf, obuf);
    51   else
     51  } else {
    5252    aubio_wavetable_do (wavetable, obuf, obuf);
     53  }
    5354}
    5455
Note: See TracChangeset for help on using the changeset viewer.