src/io/source_avcodec.c: avoid double free with libavformat56

[aubio.git] / src / io / source_avcodec.c

diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index 02943de..45aa418 100644 (file)
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -42,9 +42,12 @@
       )
 
 // backward compatibility with libavcodec55
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
-#warning "libavcodec55 is deprecated"
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,0,0)
 #define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1
+#endif
+
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
+#warning "libavcodec < 56 is deprecated"
 #define av_frame_alloc  avcodec_alloc_frame
 #define av_frame_free avcodec_free_frame
 #define av_packet_unref av_free_packet
@@ -574,9 +577,6 @@ uint_t aubio_source_avcodec_close(aubio_source_avcodec_t * s) {
   s->avCodecCtx = NULL;
   if (s->avFormatCtx != NULL) {
     avformat_close_input(&s->avFormatCtx);
-#ifndef HAVE_AUBIO_LIBAVCODEC_DEPRECATED // avoid crash on old libavcodec54
-    avformat_free_context(s->avFormatCtx);
-#endif
     s->avFormatCtx = NULL;
   }
   av_packet_unref(&s->avPacket);