Changeset 8250214


Ignore:
Timestamp:
Apr 7, 2017, 3:16:43 PM (2 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    r7a2666f r8250214  
    4343
    4444// backward compatibility with libavcodec55
     45#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,0,0)
     46#define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1
     47#endif
     48
    4549#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
    46 #warning "libavcodec55 is deprecated"
    47 #define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1
     50#warning "libavcodec < 56 is deprecated"
    4851#define av_frame_alloc  avcodec_alloc_frame
    4952#define av_frame_free avcodec_free_frame
     
    575578  if (s->avFormatCtx != NULL) {
    576579    avformat_close_input(&s->avFormatCtx);
    577 #ifndef HAVE_AUBIO_LIBAVCODEC_DEPRECATED // avoid crash on old libavcodec54
    578     avformat_free_context(s->avFormatCtx);
    579 #endif
    580580    s->avFormatCtx = NULL;
    581581  }
  • this_version.py

    r7a2666f r8250214  
    11#! python
    22import os
     3import sys
    34
    45__version_info = {} # keep a reference to parse VERSION once
     
    8283        gitsha = subprocess.check_output(gitcmd).strip().decode('utf8')
    8384    except Exception as e:
    84         print('git command error :%s' % e)
     85        sys.stderr.write('git command error :%s\n' % e)
    8586        return None
    8687    # check if we have a clean tree
     
    8990        output = subprocess.check_output(gitcmd).decode('utf8')
    9091        if len(output):
    91             print('Info: current tree is not clean\n')
    92             print(output)
     92            sys.stderr.write('Info: current tree is not clean\n\n')
     93            sys.stderr.write(output + '\n')
    9394            gitsha += '+mods'
    9495    except subprocess.CalledProcessError as e:
    95         print (e)
     96        sys.stderr.write('git command error :%s\n' % e)
    9697        pass
    9798    return gitsha
Note: See TracChangeset for help on using the changeset viewer.