Changeset 21234ee for src/io/source_avcodec.c

Timestamp:

Dec 18, 2013, 8:07:27 AM (10 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_avcodec.c (modified) (2 diffs)

src/io/source_avcodec.c

@@ -22 +22 @@
 #include "config.h"
 
-#ifdef HAVE_AVCODEC
-
-#include <sndfile.h>
+#ifdef HAVE_LIBAV
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -403 +402 @@
 }
 
-#endif /* HAVE_SNDFILE */
+#endif /* HAVE_LIBAV */