Changeset 81fe7d30


Ignore:
Timestamp:
Sep 15, 2018, 1:20:00 PM (12 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/constantq
Children:
6203a70
Parents:
f633b90 (diff), 6f3dfc0 (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 feature/constantq

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • examples/utils.h

    rf633b90 r81fe7d30  
    6767
    6868/** common process function */
    69 typedef int (*aubio_process_func_t) (fvec_t * input, fvec_t * output);
     69typedef void (*aubio_process_func_t) (fvec_t * input, fvec_t * output);
    7070
    7171void process_block (fvec_t *ibuf, fvec_t *obuf);
  • scripts/get_waf.sh

    rf633b90 r81fe7d30  
    44set -x
    55
    6 WAFVERSION=2.0.1
     6WAFVERSION=2.0.11
    77WAFTARBALL=waf-$WAFVERSION.tar.bz2
    88WAFURL=https://waf.io/$WAFTARBALL
  • src/io/source_avcodec.c

    rf633b90 r81fe7d30  
    144144  strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
    145145
     146#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,0,0)
    146147  // register all formats and codecs
    147148  av_register_all();
     149#endif
    148150
    149151  if (aubio_source_avcodec_has_network_url(s)) {
Note: See TracChangeset for help on using the changeset viewer.