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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/aea.c | 4 | ||||
| -rw-r--r-- | libavformat/flic.c | 2 | ||||
| -rw-r--r-- | libavformat/g723_1.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/mov_chan.c | 2 | ||||
| -rw-r--r-- | libavformat/wv.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/aea.c b/libavformat/aea.c index 4b6bf32b05..7675009bbc 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "pcm.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/audioconvert.h" #define AT1_SU_SIZE 212 diff --git a/libavformat/flic.c b/libavformat/flic.c index 60197638e5..2eb6f057b4 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -31,8 +31,8 @@ * special FLIs from the PC games "Magic Carpet" and "X-COM: Terror from the Deep". */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" -#include "libavutil/audioconvert.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 2674ce5327..0b92702936 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -24,7 +24,7 @@ * G.723.1 demuxer */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index 63049f559f..35c07bd0a2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -26,7 +26,7 @@ //#define MOV_EXPORT_ALL_METADATA #include "libavutil/attributes.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" #include "libavutil/mathematics.h" diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 00a2a4bb92..aa7ba1079f 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -25,7 +25,7 @@ #include <stdint.h> -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavcodec/avcodec.h" #include "mov_chan.h" diff --git a/libavformat/wv.c b/libavformat/wv.c index a2ae5a4dba..f6b96d5ce3 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "avformat.h" |