Changeset a2d628b for src

Timestamp:

Dec 11, 2016, 3:47:00 AM (8 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, sampler, yinfft+

Children:

dcde285

Parents:

22b0807

Message:

src/io/source_avcodec.c: add backward compatibility for libavcodec55

File:

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

src/io/source_avcodec.c

@@ -38 +38 @@
 #include <libavutil/opt.h>
 #include <stdlib.h>
+
+// backward compatibility with libavcodec55
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
+#warning "libavcodec55 is deprecated"
+#define av_frame_alloc  avcodec_alloc_frame
+#define av_frame_free avcodec_free_frame
+#define av_packet_unref av_free_packet
+#endif
 
 #include "aubio_priv.h"
@@ -508 +516 @@
     s->avFormatCtx = NULL;
   }
-#if FF_API_LAVF_AVCTX
   av_packet_unref(&s->avPacket);
-#else
-  av_free_packet(&s->avPacket);
-#endif
   return AUBIO_OK;
 }