From a903f8f087b0bdcc5643054147f3a5f278e7eb99 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sat, 10 Nov 2012 10:00:00 -0500
Subject: Include libavutil/channel_layout.h instead of
 libavutil/audioconvert.h

Also reorder some other #include when applicable.
---
 libavcodec/nellymoserdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libavcodec/nellymoserdec.c')

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index f17e9fd839..1f7905819c 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -31,14 +31,14 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#include "nellymoser.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
-#include "libavutil/audioconvert.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
+#include "nellymoser.h"
 #include "sinewin.h"
 
 #define BITSTREAM_READER_LE
-- 
cgit v1.2.3