diff options
Diffstat (limited to 'libavcodec')
68 files changed, 72 insertions, 75 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 682b626800..930affbb7a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,7 +1,7 @@ include $(SUBDIR)../config.mak NAME = avcodec -FFLIBS = avcore avutil +FFLIBS = avutil HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index 500e8f2ad0..0bccb84cb7 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -30,7 +30,7 @@ #ifndef AVCODEC_AACDECTAB_H #define AVCODEC_AACDECTAB_H -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "aac.h" #include <stdint.h> diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index bab354d6b9..301aadcd84 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -24,7 +24,7 @@ #include "ac3_parser.h" #include "aac_ac3_parser.h" #include "get_bits.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #define AC3_HEADER_SIZE 7 diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 851fdc9caf..c15fd5109c 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -28,7 +28,7 @@ //#define DEBUG -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "libavutil/crc.h" #include "avcodec.h" #include "put_bits.h" diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 7c0ebcdcd3..f7b030209c 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -24,7 +24,7 @@ * tables taken directly from the AC-3 spec. */ -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "ac3tab.h" diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index bfc589d26d..41b3f0caf5 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -36,7 +36,7 @@ #include "bytestream.h" #include "bgmc.h" #include "dsputil.h" -#include "libavcore/samplefmt.h" +#include "libavutil/samplefmt.h" #include "libavutil/crc.h" #include <stdint.h> diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index e673b88bee..05498777b4 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -25,7 +25,7 @@ #include "dsputil.h" #include "get_bits.h" #include "bytestream.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" /** * @file diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index b29b030644..67cacbdcf1 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -27,7 +27,7 @@ #include "libavutil/avstring.h" #include "libavutil/libm.h" -#include "libavcore/samplefmt.h" +#include "libavutil/samplefmt.h" #include "avcodec.h" #include "audioconvert.h" 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 /** diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9ed6f50856..84c3b6fc79 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 diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 95cfc92721..b77e9db0f6 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "binkdata.h" diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index d424662b5c..b8f9047c55 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/internal.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "bmp.h" diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 9d3d001297..da31e9f520 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -53,7 +53,7 @@ #include "dsputil.h" #include "bytestream.h" #include "fft.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "cookdata.h" diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 67195b1917..bdbe018be2 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -29,7 +29,7 @@ #include "libavutil/common.h" #include "libavutil/intmath.h" #include "libavutil/intreadwrite.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "dsputil.h" #include "fft.h" diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index bacd1f8e9f..c8dc7a0f62 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -25,7 +25,7 @@ * @author Marco Gerards <marco@gnu.org> */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "dirac.h" #include "avcodec.h" #include "golomb.h" diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 58893acaf9..9b37d1d632 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -22,7 +22,7 @@ //#define TRACE //#define DEBUG -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" #include "dnxhddata.h" diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 55ae4e7248..ade4e8cbc0 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -20,7 +20,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "bytestream.h" #include "avcodec.h" diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 84714def41..c89e58f529 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -27,7 +27,7 @@ * DSP utils */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "simple_idct.h" diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 6770cd195e..7f6c2a4577 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -29,7 +29,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" typedef struct CmvContext { diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 1dd3b79755..d4881ab843 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -34,7 +34,7 @@ #include "aandcttab.h" #include "mpeg12.h" #include "mpeg12data.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #define EA_PREAMBLE_SIZE 8 #define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */ diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 075405a907..9ad083475b 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -32,7 +32,7 @@ #define ALT_BITSTREAM_READER_LE #include "get_bits.h" #include "libavutil/lzo.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #define EA_PREAMBLE_SIZE 8 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T') diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index b1a7578173..cf4dfe43bc 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -20,7 +20,7 @@ #include "mpegvideo.h" #include "h263.h" #include "flv.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){ int is11 = get_bits1(gb); diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 7be284cb14..39d0db9c24 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -22,7 +22,7 @@ //#define DEBUG -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "lzw.h" diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e6f9ec9b8d..5ebf929ee9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "internal.h" #include "dsputil.h" #include "avcodec.h" diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 3fe5815ea6..469d3d8bd2 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "internal.h" #include "dsputil.h" #include "avcodec.h" diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 18ad7004d9..e64ce1eeb6 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -25,7 +25,7 @@ * IFF PBM/ILBM bitmap decoder */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "bytestream.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 2b9de0b021..4cbb287a57 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -40,7 +40,7 @@ #include "get_bits.h" #include "dsputil.h" #include "fft.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "imcdata.h" diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 6b0c049e2a..b37c343b93 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -36,8 +36,7 @@ #include "imgconvert.h" #include "libavutil/colorspace.h" #include "libavutil/pixdesc.h" -#include "libavcore/imgutils.h" -#include "libavcore/internal.h" +#include "libavutil/imgutils.h" #if HAVE_MMX && HAVE_YASM #include "x86/dsputil_mmx.h" diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 5c4cd0564a..c9d8573692 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <string.h> -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "bytestream.h" diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index efc477f37d..2f6a80c2c6 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -25,7 +25,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" typedef struct { diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c index 520ec3f03a..fb6ff45f0a 100644 --- a/libavcodec/libdiracdec.c +++ b/libavcodec/libdiracdec.c @@ -28,7 +28,7 @@ * (http://dirac.sourceforge.net/specification.html). */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "libdirac.h" #undef NDEBUG diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c index 0a9ded896d..1f8530c7c6 100644 --- a/libavcodec/libopenjpeg.c +++ b/libavcodec/libopenjpeg.c @@ -24,7 +24,7 @@ * JPEG 2000 decoder using libopenjpeg */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "libavutil/intreadwrite.h" #define OPJ_STATIC diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index e733d9e34d..7603f7e15f 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -27,7 +27,7 @@ * (http://dirac.sourceforge.net/specification.html). */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "libdirac_libschro.h" #include "libschroedinger.h" diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index f912322c50..29b8eec43e 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -27,7 +27,7 @@ #include <vpx/vpx_decoder.h> #include <vpx/vp8dx.h> -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" typedef struct VP8DecoderContext { diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index fbc637aa30..69a1837472 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -33,7 +33,7 @@ //#define DEBUG #include <assert.h> -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "mjpeg.h" diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 8bdb9e5813..04657e5ff2 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -30,7 +30,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mpegaudio.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "mpc.h" #include "mpc7data.h" diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 865ffc1b98..cf65ffe904 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -30,7 +30,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mpegaudio.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "mpc.h" #include "mpcdata.h" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c8706bcf60..efb0365905 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -28,7 +28,7 @@ */ #include "libavutil/intmath.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "internal.h" diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 80e04ee0a2..fd8568d5ab 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -34,7 +34,7 @@ #include "nellymoser.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "dsputil.h" #include "fft.h" diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index d53d4578ba..84ee6af9b3 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -23,7 +23,7 @@ #include "libavutil/bswap.h" #include "libavutil/lzo.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "rtjpeg.h" diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 189b2b5691..030507502d 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -24,7 +24,7 @@ * PCM codecs for encodings found in MPEG streams (DVD/Blu-ray) */ -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index cafade2d7d..d47417e3f7 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 1ed475787f..b7fe560953 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -28,7 +28,7 @@ #include "dsputil.h" #include "bytestream.h" #include "libavutil/colorspace.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" //#define DEBUG_PACKET_CONTENTS diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 59885ae383..f1b3607082 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -24,7 +24,7 @@ * Pictor/PC Paint decoder */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "cga_data.h" diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 4bc5c3705a..2f9b343e5b 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -18,7 +18,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "png.h" diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index c104e23427..2cbbdf60ea 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "pnm.h" diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 86b06b4aaa..28df0b6f2e 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -20,7 +20,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" typedef struct PTXContext { diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 78149e5ed8..8815736e87 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 29cc5e44d8..baffceb51b 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -28,8 +28,7 @@ #include "imgconvert.h" #include "raw.h" #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" -#include "libavcore/internal.h" +#include "libavutil/imgutils.h" typedef struct RawVideoContext { uint32_t palette[AVPALETTE_COUNT]; diff --git a/libavcodec/resample.c b/libavcodec/resample.c index 272831520d..45fba69f45 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "audioconvert.h" #include "libavutil/opt.h" -#include "libavcore/samplefmt.h" +#include "libavutil/samplefmt.h" struct AVResampleContext; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index f47540d8f1..e6e9afafb0 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -25,7 +25,7 @@ * RV10/RV20 decoder */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index acebeb7da5..5d4aafc004 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -24,7 +24,7 @@ * RV40 decoder */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index ac2adfe7ca..96af5c6fc1 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "sgi.h" diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 61f1604616..e3f00b8415 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include "avcodec.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #define ALT_BITSTREAM_READER_LE #include "get_bits.h" diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 30fdc12fe7..af03cc4d1c 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -20,7 +20,7 @@ */ #include "libavutil/avstring.h" -#include "libavcore/parseutils.h" +#include "libavutil/parseutils.h" #include "avcodec.h" #include "ass.h" diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 76b65b356c..73e4b5b91c 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -20,7 +20,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #define RT_OLD 0 diff --git a/libavcodec/targa.c b/libavcodec/targa.c index e6e1ca6f21..ef6e92bddf 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -20,7 +20,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "targa.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b012baa994..8295a4b4c0 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -33,7 +33,7 @@ #include "faxcompr.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" typedef struct TiffContext { AVCodecContext *avctx; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 448da84c57..c7d414a648 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -35,7 +35,7 @@ #include "avcodec.h" #include "dsputil.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "truemotion1data.h" diff --git a/libavcodec/txd.c b/libavcodec/txd.c index b394e1f5be..da1f5c1e20 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -22,7 +22,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "s3tc.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c4bba376bb..03fa7baeb5 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" @@ -1169,7 +1168,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) { diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 783a5daa00..8fa624168a 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -20,7 +20,7 @@ #include "dsputil.h" #include "vorbis.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0 }, diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 726f18cb92..ee41846e74 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -33,7 +33,7 @@ #include <stdlib.h> #include <string.h> -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "get_bits.h" diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 3cd76249d0..a66c10d655 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "vp56.h" #include "vp8data.h" diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index c3b5ba6556..f0ecda6217 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -68,7 +68,7 @@ #include <string.h> #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #define PALETTE_COUNT 256 diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index ffb5018c57..d5102320fd 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -22,7 +22,7 @@ #include "avcodec.h" #include "get_bits.h" #include "unary.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" /** * @file diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 872b227d64..d24588b8d9 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -18,7 +18,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" #include "bytestream.h" diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 6a75e74b7a..a117e2d791 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -24,7 +24,7 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" |