summaryrefslogtreecommitdiff
path: root/libavcodec/g722dec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-11-10 10:00:00 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-11-11 13:35:12 -0500
commita903f8f087b0bdcc5643054147f3a5f278e7eb99 (patch)
tree3a0d5ab7ebe28e9ed5529f9ac4ae3291aa56c498 /libavcodec/g722dec.c
parent5980f5dd18822f29cfd583c9c085c3e77d81aa72 (diff)
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
Also reorder some other #include when applicable.
Diffstat (limited to 'libavcodec/g722dec.c')
-rw-r--r--libavcodec/g722dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index 3364850b18..55a23d1c5e 100644
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@@ -34,11 +34,11 @@
* respectively of each byte are ignored.
*/
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/opt.h"
#include "avcodec.h"
#include "get_bits.h"
#include "g722.h"
-#include "libavutil/opt.h"
#define OFFSET(x) offsetof(G722Context, x)
#define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM