Ignore:
Timestamp:
Dec 21, 2018, 8:06:24 PM (6 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
4cb2d54, 6245b52
Parents:
cf4bc9f (diff), 131d1eb (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 'feature/sink_vorbis' into feature/sink_flac

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    rcf4bc9f r1c565c0  
    492492  uint_t length = aubio_source_validate_input_length("source_avcodec", s->path,
    493493      s->hop_size, read_data->length);
     494  if (!s->avr || !s->avFormatCtx || !s->avCodecCtx) {
     495    AUBIO_ERR("source_avcodec: could not read from %s (file was closed)\n",
     496        s->path);
     497    *read= 0;
     498    return;
     499  }
    494500  while (total_wrote < length) {
    495501    end = MIN(s->read_samples - s->read_index, length - total_wrote);
     
    530536  uint_t channels = aubio_source_validate_input_channels("source_avcodec",
    531537      s->path, s->input_channels, read_data->height);
     538  if (!s->avr || !s->avFormatCtx || !s->avCodecCtx) {
     539    AUBIO_ERR("source_avcodec: could not read from %s (file was closed)\n",
     540        s->path);
     541    *read= 0;
     542    return;
     543  }
    532544  while (total_wrote < length) {
    533545    end = MIN(s->read_samples - s->read_index, length - total_wrote);
Note: See TracChangeset for help on using the changeset viewer.