Changeset 911b175d for src


Ignore:
Timestamp:
Mar 26, 2017, 1:31:48 PM (3 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, sampler
Children:
7928b3b8
Parents:
1136442 (diff), 2a7bcaa (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 awhitening

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    r1136442 r911b175d  
    357357      av_strerror (err, errorstr, sizeof(errorstr));
    358358      AUBIO_ERR("source_avcodec: could not read frame in %s (%s)\n", s->path, errorstr);
     359      s->eof = 1;
    359360      goto beach;
    360361    }
     
    374375  if (ret < 0) {
    375376    if (ret == AVERROR(EAGAIN)) {
    376       AUBIO_WRN("source_avcodec: output is not available right now - user must try to send new input\n");
     377      //AUBIO_WRN("source_avcodec: output is not available right now - user must try to send new input\n");
     378      goto beach;
    377379    } else if (ret == AVERROR_EOF) {
    378380      AUBIO_WRN("source_avcodec: the decoder has been fully flushed, and there will be no more output frames\n");
     
    564566  s->avr = NULL;
    565567  if (s->avCodecCtx != NULL) {
     568#ifndef HAVE_AUBIO_LIBAVCODEC_DEPRECATED
     569    avcodec_free_context( &s->avCodecCtx );
     570#else
    566571    avcodec_close ( s->avCodecCtx );
     572#endif
    567573  }
    568574  s->avCodecCtx = NULL;
Note: See TracChangeset for help on using the changeset viewer.