Ignore:
Timestamp:
Dec 18, 2013, 8:07:27 AM (11 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
6465d7f
Parents:
1573b16 (diff), c3c6305 (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' of aubio.org:/git/aubio/aubio into develop

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/spectral/filterbank_mel.h

    r1573b16 r21234ee  
    11/*
    2   Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
    33                      and Amaury Hazan <ahazan@iua.upf.edu>
    44
    … …  
    3232*/
    3333
    34 #ifndef FILTERBANK_MEL_H
    35 #define FILTERBANK_MEL_H
     34#ifndef _AUBIO_FILTERBANK_MEL_H
     35#define _AUBIO_FILTERBANK_MEL_H
    3636
    3737#ifdef __cplusplus
    … …  
    7070#endif
    7171
    72 #endif // FILTERBANK_MEL_H
     72#endif /* _AUBIO_FILTERBANK_MEL_H */
Note: See TracChangeset for help on using the changeset viewer.