diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-10 10:00:00 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-11 13:35:12 -0500 |
| commit | a903f8f087b0bdcc5643054147f3a5f278e7eb99 (patch) | |
| tree | 3a0d5ab7ebe28e9ed5529f9ac4ae3291aa56c498 /libavcodec/utils.c | |
| parent | 5980f5dd18822f29cfd583c9c085c3e77d81aa72 (diff) | |
| download | ffmpeg-a903f8f087b0bdcc5643054147f3a5f278e7eb99.tar.gz | |
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
Also reorder some other #include when applicable.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 78726aeff9..8c203b92fb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -27,10 +27,10 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" -#include "libavutil/audioconvert.h" #include "libavutil/imgutils.h" #include "libavutil/samplefmt.h" #include "libavutil/dict.h" @@ -38,7 +38,6 @@ #include "dsputil.h" #include "libavutil/opt.h" #include "thread.h" -#include "audioconvert.h" #include "internal.h" #include "bytestream.h" #include <stdlib.h> |