Ignore:
Timestamp:
Dec 20, 2018, 11:31:13 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
1c565c0, 65e1ec6
Parents:
f7f946a (diff), 171ae68 (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
  • python/ext/py-source.c

    rf7f946a rcf4bc9f  
    574574    } else if (PyLong_AsLong(size) > 0) {
    575575      // short read, return a shorter array
    576       PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0);
     576      PyArrayObject *shortread = (PyArrayObject*)
     577        PyArray_FROM_OTF(PyTuple_GetItem(done, 0), NPY_NOTYPE,
     578            NPY_ARRAY_ENSURECOPY);
    577579      PyArray_Dims newdims;
    578580      PyObject *reshaped;
Note: See TracChangeset for help on using the changeset viewer.