Changeset 21234ee for src/io/source.c

Timestamp:

Dec 18, 2013, 8:07:27 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6465d7f

Parents:

1573b16 (diff), c3c6305 (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' of aubio.org:/git/aubio/aubio into develop

File:

• src/io/source.c (modified) (3 diffs)

src/io/source.c

@@ -24 +24 @@
 #include "fmat.h"
 #include "io/source.h"
-#ifdef HAVE_AVCODEC
+#ifdef HAVE_LIBAV
 #include "io/source_avcodec.h"
-#endif /* HAVE_AVCODEC */
+#endif /* HAVE_LIBAV */
 #ifdef __APPLE__
 #include "io/source_apple_audio.h"
@@ -53 +53 @@
 aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {
   aubio_source_t * s = AUBIO_NEW(aubio_source_t);
-#if HAVE_AVCODEC
+#if HAVE_LIBAV
   s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
   if (s->source) {
@@ -64 +64 @@
     return s;
   }
-#endif /* HAVE_AVCODEC */
+#endif /* HAVE_LIBAV */
 #ifdef __APPLE__
   s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);