Changeset 38a965e for src


Ignore:
Timestamp:
Sep 16, 2017, 5:41:35 PM (7 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
Children:
a729232
Parents:
5e56bbd (diff), c3e98d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into coveralls

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    r5e56bbd r38a965e  
    314314    //av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_FLTP,      0);
    315315#ifdef HAVE_AVRESAMPLE
    316     if ( ( err = avresample_open(avr) ) < 0) {
    317 #elif defined(HAVE_SWRESAMPLE)
    318     if ( ( err = swr_init(avr) ) < 0) {
     316    if ( ( err = avresample_open(avr) ) < 0)
     317#elif defined(HAVE_SWRESAMPLE)
     318    if ( ( err = swr_init(avr) ) < 0)
    319319#endif /* HAVE_AVRESAMPLE || HAVE_SWRESAMPLE */
     320    {
    320321      char errorstr[256];
    321322      av_strerror (err, errorstr, sizeof(errorstr));
    322       AUBIO_ERR("source_avcodec: Could not open AVAudioResampleContext for %s (%s)\n",
     323      AUBIO_ERR("source_avcodec: Could not open resampling context for %s (%s)\n",
    323324          s->path, errorstr);
    324       //goto beach;
    325325      return;
    326326    }
Note: See TracChangeset for help on using the changeset viewer.