Ignore:
Timestamp:
Sep 15, 2018, 1:20:00 PM (6 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/constantq
Children:
6203a70
Parents:
f633b90 (diff), 6f3dfc0 (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 feature/constantq

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_avcodec.c

    rf633b90 r81fe7d30  
    144144  strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
    145145
     146#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,0,0)
    146147  // register all formats and codecs
    147148  av_register_all();
     149#endif
    148150
    149151  if (aubio_source_avcodec_has_network_url(s)) {
Note: See TracChangeset for help on using the changeset viewer.