Changeset 8250214

Timestamp:

Apr 7, 2017, 3:16:43 PM (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

Children:

f4dbf64b

Parents:

7a2666f

Message:

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

Note: when using ffmpeg 3.2.x, valgrind will complain that `40 bytes in
1 blocks are still reachable`. This is supposedly harmless; for more
information see ​https://trac.ffmpeg.org/ticket/3194.

Files:

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

src/io/source_avcodec.c

@@ -43 +43 @@
 
 // backward compatibility with libavcodec55
+#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 "libavcodec55 is deprecated"
-#define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1
+#warning "libavcodec < 56 is deprecated"
 #define av_frame_alloc  avcodec_alloc_frame
 #define av_frame_free avcodec_free_frame
@@ -575 +578 @@
   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;
   }

this_version.py

@@ -1 +1 @@
 #! python
 import os
+import sys
 
 __version_info = {} # keep a reference to parse VERSION once
@@ -82 +83 @@
         gitsha = subprocess.check_output(gitcmd).strip().decode('utf8')
     except Exception as e:
-        print('git command error :%s' % e)
+        sys.stderr.write('git command error :%s\n' % e)
         return None
     # check if we have a clean tree
@@ -89 +90 @@
         output = subprocess.check_output(gitcmd).decode('utf8')
         if len(output):
-            print('Info: current tree is not clean\n')
-            print(output)
+            sys.stderr.write('Info: current tree is not clean\n\n')
+            sys.stderr.write(output + '\n')
             gitsha += '+mods'
     except subprocess.CalledProcessError as e:
-        print (e)
+        sys.stderr.write('git command error :%s\n' % e)
         pass
     return gitsha