X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvorbis_data.c;h=fd7e291de28ae6515c53005d28d8882a308a289c;hb=d40bb518b50561db60ef71ab0e37eb7f3fb9043b;hp=063a075ce05f54ac92a22cf6198aa400ebc3d81e;hpb=03210fe138f3b3bd7f5272fe29aca810cf517329;p=ffmpeg diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 063a075ce05..fd7e291de28 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -19,7 +19,8 @@ */ #include "libavutil/channel_layout.h" -#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" + #include "vorbis.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { @@ -33,17 +34,6 @@ const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0, 2, 1, 7, 5, 6, 3, 4 }, }; -const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = { - { 0 }, - { 0, 1 }, - { 0, 2, 1 }, - { 0, 1, 2, 3 }, - { 0, 2, 1, 3, 4 }, - { 0, 2, 1, 4, 5, 3 }, - { 0, 2, 1, 5, 6, 4, 3 }, - { 0, 2, 1, 6, 7, 4, 5, 3 }, -}; - const uint64_t ff_vorbis_channel_layouts[9] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO,