diff options
author | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
commit | e4bbb1d348dafbb32722f413648006a7bd9d0897 (patch) | |
tree | 7165ed9f86a77b751187600d0a9de8b35416f380 /audio/reorder_ch.h | |
parent | e4f2fcc0ecd31322df65141edf0ddbff9c075f5d (diff) | |
parent | 22b3f522cacfbdba76d311c86efd6091512eb089 (diff) | |
download | mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.bz2 mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.xz |
Merge branch 'planar_audio'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/reorder_ch.h')
-rw-r--r-- | audio/reorder_ch.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/audio/reorder_ch.h b/audio/reorder_ch.h index 6b5902c1b6..d81aab7dfa 100644 --- a/audio/reorder_ch.h +++ b/audio/reorder_ch.h @@ -27,8 +27,6 @@ void reorder_to_planar(void *restrict out, const void *restrict in, size_t size, size_t nchan, size_t nmemb); -void reorder_to_packed(uint8_t *out, uint8_t **in, - size_t size, size_t nchan, size_t nmemb); void reorder_channels(void *restrict data, int *restrict ch_order, size_t sample_size, size_t num_ch, size_t num_frames); |