Changeset 2a32644 for src

Timestamp:

Aug 21, 2015, 12:26:48 PM (9 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:

f549b98d

Parents:

eb68991

Message:

src/io/source_avcodec.c: avoid deprecation warning, detect if we use ffmpeg or libav version

File:

• src/io/source_avcodec.c (modified) (2 diffs)

src/io/source_avcodec.c

@@ -23 +23 @@
 
 #ifdef HAVE_LIBAV
+
+// determine whether we use libavformat from ffmpe or libav
+#define FFMPEG_LIBAVFORMAT (LIBAVFORMAT_VERSION_MICRO > 99)
 
 #include <libavcodec/avcodec.h>
@@ -101 +104 @@
 
   // try to make sure max_analyze_duration is big enough for most songs
+#if FFMPEG_LIBAVFORMAT
+  avFormatCtx->max_analyze_duration2 *= 100;
+#else
   avFormatCtx->max_analyze_duration *= 100;
+#endif
 
   // retrieve stream information