Changeset 230101d for src


Ignore:
Timestamp:
Aug 6, 2018, 5:46:22 PM (16 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
f7771c6, fb4ab89
Parents:
6b98ab9 (diff), 58fe197 (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 'fix/avr_context'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    r6b98ab9 r230101d  
    275275  // default to mono output
    276276  aubio_source_avcodec_reset_resampler(s, 0);
     277
     278  if (s->avr == NULL) goto beach;
    277279
    278280  s->eof = 0;
     
    423425    goto beach;
    424426  }
     427
     428#if LIBAVUTIL_VERSION_MAJOR > 52
     429  if (avFrame->channels != (sint_t)s->input_channels) {
     430    AUBIO_WRN ("source_avcodec: trying to read from %d channel(s),"
     431        "but configured for %d; is '%s' corrupt?\n", avFrame->channels,
     432        s->input_channels, s->path);
     433    goto beach;
     434  }
     435#endif
    425436
    426437#ifdef HAVE_AVRESAMPLE
Note: See TracChangeset for help on using the changeset viewer.