summaryrefslogtreecommitdiff
path: root/libavcodec/libfdk-aacenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-12 11:32:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-12 11:32:11 +0100
commit03b078721c8e42c413da75f553e740d235092dad (patch)
treee8efab14cdede3d6a84265c4873ad547ee704bf5 /libavcodec/libfdk-aacenc.c
parentda501ea857b13ea13749e372ccca9ae0804ff4d5 (diff)
parent97bf7c03b1338a867da52c159a2afecbdedcfa88 (diff)
downloadffmpeg-03b078721c8e42c413da75f553e740d235092dad.tar.gz
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
-rw-r--r--libavcodec/libfdk-aacenc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 2874e3797c..c2d8a2be25 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -21,12 +21,12 @@
#include <fdk-aac/aacenc_lib.h>
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
#include "avcodec.h"
#include "audio_frame_queue.h"
#include "internal.h"
-#include "libavutil/audioconvert.h"
-#include "libavutil/common.h"
-#include "libavutil/opt.h"
typedef struct AACContext {
const AVClass *class;