diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 16:37:08 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-17 01:00:30 +0300 |
| commit | 7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch) | |
| tree | 4510accdfd282fafb4f8caae1055c76ebf45e4c0 /libavcodec/avcodec.h | |
| parent | fad8143f5b9689e0e2dafe46500d944cfa58a911 (diff) | |
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6af5066a9e..013f168580 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -27,7 +27,7 @@ */ #include <errno.h> -#include "libavcore/samplefmt.h" +#include "libavutil/samplefmt.h" #include "libavutil/avutil.h" #include "libavutil/cpu.h" @@ -437,7 +437,7 @@ enum CodecID { #endif #if FF_API_OLD_AUDIOCONVERT -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" /* Audio channel masks */ #define CH_FRONT_LEFT AV_CH_FRONT_LEFT |