diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 14:37:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-16 23:00:30 +0100 |
commit | 7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch) | |
tree | 4510accdfd282fafb4f8caae1055c76ebf45e4c0 /libavformat/flic.c | |
parent | fad8143f5b9689e0e2dafe46500d944cfa58a911 (diff) | |
download | ffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz |
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'libavformat/flic.c')
-rw-r--r-- | libavformat/flic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flic.c b/libavformat/flic.c index 2e03c3b3a1..5942f721dc 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -32,8 +32,8 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/audioconvert.h" #include "avformat.h" -#include "libavcore/audioconvert.h" #define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_2 0xAF12 |