Changeset 2434566 for src

Timestamp:

Dec 13, 2018, 3:36:33 AM (6 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/timestretch, fix/ffmpeg5, master

Children:

7735d06

Parents:

0f5837d

Message:

[io] avoid deprecation warning avcodec <= 58.3.102

File:

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

src/io/source_avcodec.c

@@ -45 +45 @@
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,0,0)
 #define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1
+#endif
+
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,3,102)
+#define HAVE_AUBIO_LIBAVCODEC_TIMEBASE_FIX 1
 #endif
 
@@ -240 +244 @@
     goto beach;
   }
-#if FFMPEG_LIBAVFORMAT // deprecated with ffmpeg, required with libav
+#if HAVE_AUBIO_LIBAVCODEC_TIMEBASE_FIX
+  // avoids 'skipped frames warning' with avecodec < 58, deprecated after
   av_codec_set_pkt_timebase(avCodecCtx,
       avFormatCtx->streams[selected_stream]->time_base);