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/wv.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/wv.c')
-rw-r--r-- | libavformat/wv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wv.c b/libavformat/wv.c index 182f900f36..c9a1f0ed9c 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/audioconvert.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "apetag.h" #include "id3v1.h" -#include "libavcore/audioconvert.h" // specs say that maximum block size is 1Mb #define WV_BLOCK_LIMIT 1047576 |