Changeset d64f56d


Ignore:
Timestamp:
Dec 19, 2018, 3:47:31 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
65628c4
Parents:
99365e9 (diff), eba24c59 (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_flac' into feature/autosink

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/sink_flac.c

    r99365e9 rd64f56d  
    6464  FLAC__StreamEncoder* encoder;
    6565  FLAC__int32 *buffer;
    66   FLAC__StreamMetadata *metadata[2];
     66  FLAC__StreamMetadata **metadata;
    6767};
    6868
     
    165165  if (!ok) {
    166166    AUBIO_ERR("sink_flac: failed setting metadata for %s\n", s->path);
     167    goto failure;
     168  }
     169
     170  s->metadata = AUBIO_ARRAY(FLAC__StreamMetadata*, 2);
     171  if (!s->metadata) {
     172    AUBIO_ERR("sink_flac: failed allocating memory for %s\n", s->path);
    167173    goto failure;
    168174  }
     
    324330  if (s->metadata) {
    325331    // clean up metadata after stream finished
    326     FLAC__metadata_object_delete(s->metadata[0]);
    327     FLAC__metadata_object_delete(s->metadata[1]);
     332    if (s->metadata[0])
     333      FLAC__metadata_object_delete(s->metadata[0]);
     334    if (s->metadata[1])
     335      FLAC__metadata_object_delete(s->metadata[1]);
     336    AUBIO_FREE(s->metadata);
    328337  }
    329338
Note: See TracChangeset for help on using the changeset viewer.