Changeset 2a32644


Ignore:
Timestamp:
Aug 21, 2015, 12:26:48 PM (9 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, pitchshift, sampler, timestretch, yinfft+
Children:
f549b98d
Parents:
eb68991
Message:

src/io/source_avcodec.c: avoid deprecation warning, detect if we use ffmpeg or libav version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    reb68991 r2a32644  
    2323
    2424#ifdef HAVE_LIBAV
     25
     26// determine whether we use libavformat from ffmpe or libav
     27#define FFMPEG_LIBAVFORMAT (LIBAVFORMAT_VERSION_MICRO > 99)
    2528
    2629#include <libavcodec/avcodec.h>
     
    101104
    102105  // try to make sure max_analyze_duration is big enough for most songs
     106#if FFMPEG_LIBAVFORMAT
     107  avFormatCtx->max_analyze_duration2 *= 100;
     108#else
    103109  avFormatCtx->max_analyze_duration *= 100;
     110#endif
    104111
    105112  // retrieve stream information
Note: See TracChangeset for help on using the changeset viewer.