Changeset 81fe7d30

Timestamp:

Sep 15, 2018, 1:20:00 PM (6 years 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:

• examples/utils.h (modified) (1 diff)
• scripts/get_waf.sh (modified) (1 diff)
• src/io/source_avcodec.c (modified) (1 diff)

examples/utils.h

@@ -67 +67 @@
 
 /** common process function */
-typedef int (*aubio_process_func_t) (fvec_t * input, fvec_t * output);
+typedef void (*aubio_process_func_t) (fvec_t * input, fvec_t * output);
 
 void process_block (fvec_t *ibuf, fvec_t *obuf);

scripts/get_waf.sh

@@ -4 +4 @@
 set -x
 
-WAFVERSION=2.0.1
+WAFVERSION=2.0.11
 WAFTARBALL=waf-$WAFVERSION.tar.bz2
 WAFURL=https://waf.io/$WAFTARBALL

src/io/source_avcodec.c

@@ -144 +144 @@
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
 
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,0,0)
   // register all formats and codecs
   av_register_all();
+#endif
 
   if (aubio_source_avcodec_has_network_url(s)) {