Changeset 0fdab5b


Ignore:
Timestamp:
Mar 17, 2017, 6:39:15 PM (3 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
sampler
Children:
218f670
Parents:
9938200 (diff), 91fa88d (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 sampler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    r9938200 r0fdab5b  
    388388      av_strerror (err, errorstr, sizeof(errorstr));
    389389      AUBIO_ERR("source_avcodec: could not read frame in %s (%s)\n", s->path, errorstr);
     390      s->eof = 1;
    390391      goto beach;
    391392    }
     
    595596  s->avr = NULL;
    596597  if (s->avCodecCtx != NULL) {
     598#ifndef HAVE_AUBIO_LIBAVCODEC_DEPRECATED
     599    avcodec_free_context( &s->avCodecCtx );
     600#else
    597601    avcodec_close ( s->avCodecCtx );
     602#endif
    598603  }
    599604  s->avCodecCtx = NULL;
Note: See TracChangeset for help on using the changeset viewer.