Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

[ffmpeg] / libavcodec / vorbis_data.c

diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index f4b25fbf20f130bc53fe70e048e773cc979a39da..8aa8015df5e3a62f96f685c01f2a8fd6dc1cccee 100644 (file)
--- a/libavcodec/vorbis_data.c
+++ b/libavcodec/vorbis_data.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 #include "vorbis.h"
-#include "libavutil/audioconvert.h"
-#include "libavutil/mem.h"
 
 const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
     { 0 },