summaryrefslogtreecommitdiff
path: root/libavcodec/audioconvert.h
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-02-07 14:37:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-16 23:00:30 +0100
commit7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch)
tree4510accdfd282fafb4f8caae1055c76ebf45e4c0 /libavcodec/audioconvert.h
parentfad8143f5b9689e0e2dafe46500d944cfa58a911 (diff)
downloadffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'libavcodec/audioconvert.h')
-rw-r--r--libavcodec/audioconvert.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index ae6016a611..5f38cca513 100644
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -31,7 +31,7 @@
#include "libavutil/cpu.h"
#include "avcodec.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
#if FF_API_OLD_SAMPLE_FMT
/**