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 /libavcodec/utils.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 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2d62f079c4..7fba5c6aeb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -29,10 +29,9 @@ #include "libavutil/integer.h" #include "libavutil/crc.h" #include "libavutil/pixdesc.h" -#include "libavcore/audioconvert.h" -#include "libavcore/imgutils.h" -#include "libavcore/internal.h" -#include "libavcore/samplefmt.h" +#include "libavutil/audioconvert.h" +#include "libavutil/imgutils.h" +#include "libavutil/samplefmt.h" #include "avcodec.h" #include "dsputil.h" #include "libavutil/opt.h" @@ -1211,7 +1210,7 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v) } #if LIBAVCODEC_VERSION_MAJOR < 53 -#include "libavcore/parseutils.h" +#include "libavutil/parseutils.h" int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str) { |