[FFmpeg-cvslog] Merge libavcore into libavutil
Reinhard Tartler
git
Wed Feb 16 23:18:31 CET 2011
ffmpeg | branch: master | Reinhard Tartler <siretart at tauware.de> | Mon Feb 7 14:37:08 2011 +0100| [7ffe76e540297ad4df2896064f83cb1adbd81fd9] | committer: Michael Niedermayer
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ffe76e540297ad4df2896064f83cb1adbd81fd9
---
Makefile | 1 -
cmdutils.c | 2 -
common.mak | 2 +-
configure | 13 +----
doc/APIchanges | 4 +-
doc/general.texi | 2 +-
ffmpeg.c | 6 +-
ffplay.c | 6 +-
ffserver.c | 2 +-
libavcodec/Makefile | 2 +-
libavcodec/aacdectab.h | 2 +-
libavcodec/ac3_parser.c | 2 +-
libavcodec/ac3enc.c | 2 +-
libavcodec/ac3tab.c | 2 +-
libavcodec/alsdec.c | 2 +-
libavcodec/apedec.c | 2 +-
libavcodec/audioconvert.c | 2 +-
libavcodec/audioconvert.h | 2 +-
libavcodec/avcodec.h | 4 +-
libavcodec/bink.c | 2 +-
libavcodec/bmpenc.c | 2 +-
libavcodec/cook.c | 2 +-
libavcodec/dca.c | 2 +-
libavcodec/dirac.c | 2 +-
libavcodec/dnxhddec.c | 2 +-
libavcodec/dpx.c | 2 +-
libavcodec/dsputil.c | 2 +-
libavcodec/eacmv.c | 2 +-
libavcodec/eamad.c | 2 +-
libavcodec/eatgv.c | 2 +-
libavcodec/flvdec.c | 2 +-
libavcodec/gifdec.c | 2 +-
libavcodec/h264.c | 2 +-
libavcodec/h264_ps.c | 2 +-
libavcodec/iff.c | 2 +-
libavcodec/imc.c | 2 +-
libavcodec/imgconvert.c | 3 +-
libavcodec/indeo3.c | 2 +-
libavcodec/kgv1dec.c | 2 +-
libavcodec/libdiracdec.c | 2 +-
libavcodec/libopenjpeg.c | 2 +-
libavcodec/libschroedingerdec.c | 2 +-
libavcodec/libvpxdec.c | 2 +-
libavcodec/mjpegdec.c | 2 +-
libavcodec/mpc7.c | 2 +-
libavcodec/mpc8.c | 2 +-
libavcodec/mpegvideo.c | 2 +-
libavcodec/nellymoserdec.c | 2 +-
libavcodec/nuv.c | 2 +-
libavcodec/pcm-mpeg.c | 2 +-
libavcodec/pcx.c | 2 +-
libavcodec/pgssubdec.c | 2 +-
libavcodec/pictordec.c | 2 +-
libavcodec/pngdec.c | 2 +-
libavcodec/pnm.c | 2 +-
libavcodec/ptx.c | 2 +-
libavcodec/qtrleenc.c | 2 +-
libavcodec/rawdec.c | 3 +-
libavcodec/resample.c | 2 +-
libavcodec/rv10.c | 2 +-
libavcodec/rv40.c | 2 +-
libavcodec/sgidec.c | 2 +-
libavcodec/smacker.c | 2 +-
libavcodec/srtdec.c | 2 +-
libavcodec/sunrast.c | 2 +-
libavcodec/targa.c | 2 +-
libavcodec/tiff.c | 2 +-
libavcodec/truemotion1.c | 2 +-
libavcodec/txd.c | 2 +-
libavcodec/utils.c | 9 ++--
libavcodec/vorbis_data.c | 2 +-
libavcodec/vp3.c | 2 +-
libavcodec/vp8.c | 2 +-
libavcodec/vqavideo.c | 2 +-
libavcodec/wavpack.c | 2 +-
libavcodec/xsubdec.c | 2 +-
libavcodec/yop.c | 2 +-
libavcore/Makefile | 20 ---------
libavcore/avcore.h | 70 -------------------------------
libavcore/internal.h | 31 --------------
libavcore/libavcore.v | 4 --
libavcore/utils.c | 41 ------------------
libavdevice/Makefile | 2 +-
libavdevice/v4l.c | 2 +-
libavdevice/v4l2.c | 2 +-
libavfilter/Makefile | 2 +-
libavfilter/asrc_anullsrc.c | 2 +-
libavfilter/avfilter.c | 4 +-
libavfilter/avfilter.h | 5 +-
libavfilter/defaults.c | 6 +-
libavfilter/vf_crop.c | 2 +-
libavfilter/vf_cropdetect.c | 2 +-
libavfilter/vf_drawbox.c | 2 +-
libavfilter/vf_frei0r.c | 4 +-
libavfilter/vf_gradfun.c | 2 +-
libavfilter/vf_hflip.c | 2 +-
libavfilter/vf_mp.c | 2 +-
libavfilter/vf_overlay.c | 2 +-
libavfilter/vf_pad.c | 4 +-
libavfilter/vf_transpose.c | 2 +-
libavfilter/vsrc_buffer.c | 2 +-
libavfilter/vsrc_movie.c | 2 +-
libavfilter/vsrc_nullsrc.c | 2 +-
libavformat/Makefile | 2 +-
libavformat/aea.c | 2 +-
libavformat/flic.c | 2 +-
libavformat/matroskaenc.c | 2 +-
libavformat/utils.c | 2 +-
libavformat/wv.c | 2 +-
libavutil/Makefile | 8 ++++
{libavcore => libavutil}/audioconvert.c | 1 +
{libavcore => libavutil}/audioconvert.h | 10 ++--
libavutil/avutil.h | 14 ++++++-
{libavcore => libavutil}/imgutils.c | 0
{libavcore => libavutil}/imgutils.h | 10 +++--
{libavcore => libavutil}/parseutils.c | 2 +-
{libavcore => libavutil}/parseutils.h | 8 ++--
{libavcore => libavutil}/samplefmt.c | 5 ++-
{libavcore => libavutil}/samplefmt.h | 8 ++--
libswscale/Makefile | 1 -
libswscale/swscale-test.c | 2 +-
121 files changed, 167 insertions(+), 320 deletions(-)
diff --git a/Makefile b/Makefile
index 99d264a..4ed003b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ FFLIBS-$(CONFIG_AVFORMAT) += avformat
FFLIBS-$(CONFIG_AVCODEC) += avcodec
FFLIBS-$(CONFIG_POSTPROC) += postproc
FFLIBS-$(CONFIG_SWSCALE) += swscale
-FFLIBS-$(CONFIG_AVCORE) += avcore
FFLIBS := avutil
diff --git a/cmdutils.c b/cmdutils.c
index 0679f01..b71272d 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -38,7 +38,6 @@
#include "libavutil/pixdesc.h"
#include "libavutil/eval.h"
#include "libavcodec/opt.h"
-#include "libavcore/avcore.h"
#include "cmdutils.h"
#include "version.h"
#if CONFIG_NETWORK
@@ -413,7 +412,6 @@ static int warned_cfg = 0;
static void print_all_libs_info(FILE* outstream, int flags)
{
PRINT_LIB_INFO(outstream, avutil, AVUTIL, flags);
- PRINT_LIB_INFO(outstream, avcore, AVCORE, flags);
PRINT_LIB_INFO(outstream, avcodec, AVCODEC, flags);
PRINT_LIB_INFO(outstream, avformat, AVFORMAT, flags);
PRINT_LIB_INFO(outstream, avdevice, AVDEVICE, flags);
diff --git a/common.mak b/common.mak
index 110f505..3d1a129 100644
--- a/common.mak
+++ b/common.mak
@@ -31,7 +31,7 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
endif
-ALLFFLIBS = avcodec avcore avdevice avfilter avformat avutil postproc swscale
+ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
diff --git a/configure b/configure
index 7af0e85..5adad70 100755
--- a/configure
+++ b/configure
@@ -86,7 +86,6 @@ Configuration options:
--disable-ffserver disable ffserver build
--disable-avdevice disable libavdevice build
--disable-avcodec disable libavcodec build
- --disable-avcore disable libavcore build
--disable-avformat disable libavformat build
--disable-swscale disable libswscale build
--enable-postproc enable GPLed postprocessing support [no]
@@ -871,7 +870,6 @@ CONFIG_LIST="
$COMPONENT_LIST
aandct
avcodec
- avcore
avdevice
avfilter
avformat
@@ -1590,7 +1588,6 @@ host_os=$target_os_default
# configurable options
enable avcodec
-enable avcore
enable avdevice
enable avfilter
enable avformat
@@ -2934,7 +2931,7 @@ enabled extra_warnings && check_cflags -Winline
# add some linker flags
check_ldflags -Wl,--warn-common
check_ldflags -Wl,--as-needed
-check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavcore -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
echo "X{};" > $TMPV
@@ -3144,7 +3141,6 @@ if enabled source_path_used; then
doc
libavcodec
libavcodec/$arch
- libavcore
libavdevice
libavfilter
libavfilter/$arch
@@ -3166,7 +3162,6 @@ if enabled source_path_used; then
doc/texi2pod.pl
libavcodec/Makefile
libavcodec/${arch}/Makefile
- libavcore/Makefile
libavdevice/Makefile
libavfilter/Makefile
libavfilter/${arch}/Makefile
@@ -3269,7 +3264,6 @@ get_version(){
get_version LIBSWSCALE libswscale/swscale.h
get_version LIBPOSTPROC libpostproc/postprocess.h
get_version LIBAVCODEC libavcodec/avcodec.h
-get_version LIBAVCORE libavcore/avcore.h
get_version LIBAVDEVICE libavdevice/avdevice.h
get_version LIBAVFORMAT libavformat/version.h
get_version LIBAVUTIL libavutil/avutil.h
@@ -3397,10 +3391,9 @@ EOF
}
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
-pkgconfig_generate libavcore "FFmpeg multimedia shared core utilities library" "$LIBAVCORE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavcore = $LIBAVCORE_VERSION"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs"
pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavcore = $LIBAVCORE_VERSION"
+pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"
pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
diff --git a/doc/APIchanges b/doc/APIchanges
index ce9d51c..eb63072 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,7 +2,6 @@ Never assume the API of libav* to be stable unless at least 1 week has passed si
the last major version increase.
The last version increases were:
libavcodec: ?
-libavcore: 2010-07-21
libavdevice: ?
libavfilter: 2009-10-18
libavformat: ?
@@ -13,6 +12,9 @@ libavutil: 2009-03-08
API changes, most recent first:
+2011-02-15 - lavu 52.38.0 - merge libavcore
+ libavcore is merged back completely into libavutil
+
2011-02-10 - 55bad0c - lavc 52.113.0 - vbv_delay
Add vbv_delay field to AVCodecContext
diff --git a/doc/general.texi b/doc/general.texi
index 3fc4d00..cd126f9 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -986,7 +986,7 @@ you should only need to add the directory where the LIB files are installed
(i.e. @file{c:\msys\usr\local\bin}). This is not a typo, the LIB files are
installed in the @file{bin} directory. And instead of adding the static
libraries (@file{libxxx.a} files) you should add the MSVC import libraries
-(@file{avcodec.lib}, @file{avformat.lib}, @file{avcore.lib}, and
+(@file{avcodec.lib}, @file{avformat.lib}, and
@file{avutil.lib}). Note that you should not use the GCC import
libraries (@file{libxxx.dll.a} files), as these will give you undefined
reference errors. There should be no need for @file{libmingwex.a},
diff --git a/ffmpeg.c b/ffmpeg.c
index 8788dce..217cd17 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -36,9 +36,9 @@
#include "libswscale/swscale.h"
#include "libavcodec/opt.h"
#include "libavcodec/audioconvert.h"
-#include "libavcore/audioconvert.h"
-#include "libavcore/parseutils.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/audioconvert.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/samplefmt.h"
#include "libavutil/colorspace.h"
#include "libavutil/fifo.h"
#include "libavutil/intreadwrite.h"
diff --git a/ffplay.c b/ffplay.c
index e97ec78..dbbac5e 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -28,9 +28,9 @@
#include "libavutil/avstring.h"
#include "libavutil/colorspace.h"
#include "libavutil/pixdesc.h"
-#include "libavcore/imgutils.h"
-#include "libavcore/parseutils.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/samplefmt.h"
#include "libavformat/avformat.h"
#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
diff --git a/ffserver.c b/ffserver.c
index 9a32408..cbf04aa 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -36,7 +36,7 @@
#include "libavutil/avstring.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/parseutils.h"
#include "libavcodec/opt.h"
#include <stdarg.h>
#include <unistd.h>
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 682b626..930affb 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 500e8f2..0bccb84 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 bab354d..301aadc 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 851fdc9..c15fd51 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 7c0ebcd..f7b0302 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 bfc589d..41b3f0c 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 e673b88..0549877 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 b29b030..67cacbd 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 ae6016a..5f38cca 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 6af5066..013f168 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 95cfc92..b77e9db 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 d424662..b8f9047 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 9d3d001..da31e9f 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 67195b1..bdbe018 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 bacd1f8..c8dc7a0 100644
--- a/libavcodec/dirac.c
+++ b/libavcodec/dirac.c
@@ -25,7 +25,7 @@
* @author Marco Gerards <marco at 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 58893ac..9b37d1d 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 55ae4e7..ade4e8c 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 84714de..c89e58f 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 6770cd1..7f6c2a4 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 1dd3b79..d4881ab 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 075405a..9ad0834 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 b1a7578..cf4dfe4 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 7be284c..39d0db9 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 e6f9ec9..5ebf929 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -25,7 +25,7 @@
* @author Michael Niedermayer <michaelni at 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 3fe5815..469d3d8 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -25,7 +25,7 @@
* @author Michael Niedermayer <michaelni at 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 18ad700..e64ce1e 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 2b9de0b..4cbb287 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 6b0c049..b37c343 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 5c4cd05..c9d8573 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 efc477f..2f6a80c 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 520ec3f..fb6ff45 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 0a9ded8..1f8530c 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 e733d9e..7603f7e 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 f912322..29b8eec 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 dbfd599..d0fc524 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 8bdb9e5..04657e5 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 865ffc1..cf65ffe 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 c8706bc..efb0365 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 80e04ee..fd8568d 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 d53d457..84ee6af 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 189b2b5..0305075 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 cafade2..d47417e 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 1ed4757..b7fe560 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 59885ae..f1b3607 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 4bc5c37..2f9b343 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 c104e23..2cbbdf6 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 86b06b4..28df0b6 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 78149e5..8815736 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 29cc5e4..baffceb 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 2728315..45fba69 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 f47540d..e6e9afa 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 acebeb7..5d4aafc 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 ac2adfe..96af5c6 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 61f1604..e3f00b8 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 30fdc12..af03cc4 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 76b65b3..73e4b5b 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 e6e1ca6..ef6e92b 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 b012baa..8295a4b 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 448da84..c7d414a 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 b394e1f..da1f5c1 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 2d62f07..7fba5c6 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)
{
diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index 783a5da..8fa6241 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 726f18c..ee41846 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 3cd7624..a66c10d 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 c3b5ba6..f0ecda6 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 ffb5018..d510232 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 872b227..d24588b 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 6a75e74..a117e2d 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"
diff --git a/libavcore/Makefile b/libavcore/Makefile
deleted file mode 100644
index f2e8297..0000000
--- a/libavcore/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-include $(SUBDIR)../config.mak
-
-NAME = avcore
-FFLIBS = avutil
-
-HEADERS = \
- audioconvert.h \
- avcore.h \
- imgutils.h \
- parseutils.h \
- samplefmt.h \
-
-OBJS = \
- audioconvert.o \
- imgutils.o \
- parseutils.o \
- samplefmt.o \
- utils.o \
-
-include $(SUBDIR)../subdir.mak
diff --git a/libavcore/avcore.h b/libavcore/avcore.h
deleted file mode 100644
index 9b02c3b..0000000
--- a/libavcore/avcore.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCORE_AVCORE_H
-#define AVCORE_AVCORE_H
-
-/**
- * @file
- * shared media utilities for the libav* libraries
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVCORE_VERSION_MAJOR 0
-#define LIBAVCORE_VERSION_MINOR 16
-#define LIBAVCORE_VERSION_MICRO 1
-
-#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
- LIBAVCORE_VERSION_MINOR, \
- LIBAVCORE_VERSION_MICRO)
-#define LIBAVCORE_VERSION AV_VERSION(LIBAVCORE_VERSION_MAJOR, \
- LIBAVCORE_VERSION_MINOR, \
- LIBAVCORE_VERSION_MICRO)
-#define LIBAVCORE_BUILD LIBAVCORE_VERSION_INT
-
-#define LIBAVCORE_IDENT "Lavcore" AV_STRINGIFY(LIBAVCORE_VERSION)
-
-/**
- * Return the LIBAVCORE_VERSION_INT constant.
- */
-unsigned avcore_version(void);
-
-/**
- * Return the libavcore build-time configuration.
- */
-const char *avcore_configuration(void);
-
-/**
- * Return the libavcore license.
- */
-const char *avcore_license(void);
-
-#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
-#define AV_TIME_BASE 1000000
-#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_OLD_IMAGE_NAMES
-#define FF_API_OLD_IMAGE_NAMES (LIBAVCORE_VERSION_MAJOR < 1)
-#endif
-
-#endif /* AVCORE_AVCORE_H */
diff --git a/libavcore/internal.h b/libavcore/internal.h
deleted file mode 100644
index 3960bd3..0000000
--- a/libavcore/internal.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCORE_INTERNAL_H
-#define AVCORE_INTERNAL_H
-
-/**
- * @file
- * internal functions
- */
-
-#include "avcore.h"
-
-int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
-
-#endif /* AVCORE_INTERNAL_H */
diff --git a/libavcore/libavcore.v b/libavcore/libavcore.v
deleted file mode 100644
index dc84cc4..0000000
--- a/libavcore/libavcore.v
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBAVCORE_$MAJOR {
- global: av_*; ff_*; avcore*;
- local: *;
-};
diff --git a/libavcore/utils.c b/libavcore/utils.c
deleted file mode 100644
index 8350a9b..0000000
--- a/libavcore/utils.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "avcore.h"
-
-/**
- * @file
- * various utility functions
- */
-
-unsigned avcore_version(void)
-{
- return LIBAVCORE_VERSION_INT;
-}
-
-const char *avcore_configuration(void)
-{
- return FFMPEG_CONFIGURATION;
-}
-
-const char *avcore_license(void)
-{
-#define LICENSE_PREFIX "libavcore license: "
- return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
-}
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 1c0630b..be28f4a 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,7 +1,7 @@
include $(SUBDIR)../config.mak
NAME = avdevice
-FFLIBS = avformat avcodec avcore avutil
+FFLIBS = avformat avcodec avutil
HEADERS = avdevice.h
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index c107684..9a155f9 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -22,7 +22,7 @@
#undef __STRICT_ANSI__ //workaround due to broken kernel headers
#include "config.h"
#include "libavutil/rational.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "libavformat/avformat.h"
#include "libavcodec/dsputil.h"
#include <unistd.h>
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 993e2ad..1f1a4bc 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -43,7 +43,7 @@
#endif
#include <time.h>
#include <strings.h>
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
static const int desired_video_buffers = 256;
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 4148064..c05f217 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,7 +1,7 @@
include $(SUBDIR)../config.mak
NAME = avfilter
-FFLIBS = avcore avutil
+FFLIBS = avutil
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
FFLIBS-$(CONFIG_MP_FILTER) += avcodec
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 306e0a3..4f49c3f 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -22,7 +22,7 @@
*/
#include "avfilter.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
typedef struct {
int64_t channel_layout;
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 4d18329..039e04b 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -23,8 +23,8 @@
#include "libavutil/pixdesc.h"
#include "libavutil/rational.h"
-#include "libavcore/audioconvert.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/audioconvert.h"
+#include "libavutil/imgutils.h"
#include "avfilter.h"
#include "internal.h"
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 451d0be..935214d 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -23,8 +23,7 @@
#define AVFILTER_AVFILTER_H
#include "libavutil/avutil.h"
-#include "libavcore/avcore.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 76
@@ -585,7 +584,7 @@ struct AVFilterLink {
int h; ///< agreed upon image height
AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
/* These two parameters apply only to audio */
- int64_t channel_layout; ///< channel layout of current buffer (see libavcore/audioconvert.h)
+ int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h)
int64_t sample_rate; ///< samples per second
int format; ///< agreed upon media format
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 9f245c3..1da2630 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcore/audioconvert.h"
-#include "libavcore/imgutils.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/audioconvert.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/samplefmt.h"
#include "avfilter.h"
#include "internal.h"
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index e768fbb..e02c24f 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -29,7 +29,7 @@
#include "libavutil/eval.h"
#include "libavutil/avstring.h"
#include "libavutil/libm.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
static const char *var_names[] = {
"E",
diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c
index 62c6864..000c8bb 100644
--- a/libavfilter/vf_cropdetect.c
+++ b/libavfilter/vf_cropdetect.c
@@ -23,7 +23,7 @@
* Ported from MPlayer libmpcodecs/vf_cropdetect.c.
*/
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "avfilter.h"
typedef struct {
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index 40d5e16..3785072 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -26,7 +26,7 @@
#include "libavutil/colorspace.h"
#include "libavutil/pixdesc.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/parseutils.h"
#include "avfilter.h"
enum { Y, U, V, A };
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 03d4f28..adccccb 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -27,8 +27,8 @@
#include <dlfcn.h>
#include <frei0r.h>
#include "libavutil/avstring.h"
-#include "libavcore/imgutils.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
#include "avfilter.h"
typedef f0r_instance_t (*f0r_construct_f)(unsigned int width, unsigned int height);
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 3a400a0..83ed3d7 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -32,7 +32,7 @@
* Dither it back to 8bit.
*/
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "libavutil/cpu.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c
index 4deb14a..5250695 100644
--- a/libavfilter/vf_hflip.c
+++ b/libavfilter/vf_hflip.c
@@ -27,7 +27,7 @@
#include "avfilter.h"
#include "libavutil/pixdesc.h"
#include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
typedef struct {
int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 4c653e4..484572c 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -28,7 +28,7 @@
#include "libavutil/avassert.h"
#include "libavutil/pixdesc.h"
#include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "libmpcodecs/vf.h"
#include "libmpcodecs/img_format.h"
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index a170e81..0eb24b9 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -29,7 +29,7 @@
#include "libavutil/eval.h"
#include "libavutil/avstring.h"
#include "libavutil/pixdesc.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "internal.h"
static const char *var_names[] = {
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 467db5b..7413071 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -28,8 +28,8 @@
#include "libavutil/pixdesc.h"
#include "libavutil/colorspace.h"
#include "libavutil/avassert.h"
-#include "libavcore/imgutils.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
enum { RED = 0, GREEN, BLUE, ALPHA };
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 272b17f..ed91aaa 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -27,7 +27,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/pixdesc.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "avfilter.h"
typedef struct {
diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c
index 6845c74..7b9ae95 100644
--- a/libavfilter/vsrc_buffer.c
+++ b/libavfilter/vsrc_buffer.c
@@ -25,7 +25,7 @@
#include "avfilter.h"
#include "vsrc_buffer.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
typedef struct {
int64_t pts;
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 4fd56fe..fac30f9 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -33,7 +33,7 @@
#include <float.h>
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "libavformat/avformat.h"
#include "avfilter.h"
diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c
index 1cd06e1..487aa50 100644
--- a/libavfilter/vsrc_nullsrc.c
+++ b/libavfilter/vsrc_nullsrc.c
@@ -23,7 +23,7 @@
#include "libavutil/avstring.h"
#include "libavutil/eval.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/parseutils.h"
#include "avfilter.h"
static const char *var_names[] = {
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 1d4e75e..f319031 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,7 +1,7 @@
include $(SUBDIR)../config.mak
NAME = avformat
-FFLIBS = avcodec avcore avutil
+FFLIBS = avcodec avutil
HEADERS = avformat.h avio.h version.h
diff --git a/libavformat/aea.c b/libavformat/aea.c
index 8a508ec..16a11c8 100644
--- a/libavformat/aea.c
+++ b/libavformat/aea.c
@@ -23,7 +23,7 @@
#include "avformat.h"
#include "pcm.h"
#include "libavutil/intreadwrite.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
#define AT1_SU_SIZE 212
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 2e03c3b..5942f72 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -32,8 +32,8 @@
*/
#include "libavutil/intreadwrite.h"
+#include "libavutil/audioconvert.h"
#include "avformat.h"
-#include "libavcore/audioconvert.h"
#define FLIC_FILE_MAGIC_1 0xAF11
#define FLIC_FILE_MAGIC_2 0xAF12
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a288c7f..1d0dc38 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -26,7 +26,7 @@
#include "avc.h"
#include "flacenc.h"
#include "avlanguage.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/samplefmt.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/random_seed.h"
#include "libavutil/lfg.h"
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6abfdcd..2827930 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3341,7 +3341,7 @@ void dump_format(AVFormatContext *ic,
}
#if FF_API_PARSE_FRAME_PARAM
-#include "libavcore/parseutils.h"
+#include "libavutil/parseutils.h"
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{
diff --git a/libavformat/wv.c b/libavformat/wv.c
index 182f900..c9a1f0e 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
diff --git a/libavutil/Makefile b/libavutil/Makefile
index fe0302c..300acb1 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -4,6 +4,7 @@ NAME = avutil
HEADERS = adler32.h \
attributes.h \
+ audioconvert.h \
avassert.h \
avstring.h \
avutil.h \
@@ -16,6 +17,7 @@ HEADERS = adler32.h \
eval.h \
fifo.h \
file.h \
+ imgutils.h \
intfloat_readwrite.h \
intreadwrite.h \
lfg.h \
@@ -25,16 +27,19 @@ HEADERS = adler32.h \
md5.h \
mem.h \
opt.h \
+ parseutils.h \
pixdesc.h \
pixfmt.h \
random_seed.h \
rational.h \
+ samplefmt.h \
sha1.h \
BUILT_HEADERS = avconfig.h
OBJS = adler32.o \
aes.o \
+ audioconvert.o \
avstring.o \
base64.o \
cpu.o \
@@ -44,6 +49,7 @@ OBJS = adler32.o \
eval.o \
fifo.o \
file.o \
+ imgutils.o \
intfloat_readwrite.o \
inverse.o \
lfg.o \
@@ -54,10 +60,12 @@ OBJS = adler32.o \
md5.o \
mem.o \
opt.o \
+ parseutils.o \
pixdesc.o \
random_seed.o \
rational.o \
rc4.o \
+ samplefmt.o \
sha.o \
tree.o \
utils.o \
diff --git a/libavcore/audioconvert.c b/libavutil/audioconvert.c
similarity index 99%
rename from libavcore/audioconvert.c
rename to libavutil/audioconvert.c
index c720733..8bc43f8 100644
--- a/libavcore/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -23,6 +23,7 @@
* audio conversion routines
*/
+#include "libavutil/avutil.h"
#include "libavutil/avstring.h"
#include "audioconvert.h"
diff --git a/libavcore/audioconvert.h b/libavutil/audioconvert.h
similarity index 97%
rename from libavcore/audioconvert.h
rename to libavutil/audioconvert.h
index 89e9c55..134c610 100644
--- a/libavcore/audioconvert.h
+++ b/libavutil/audioconvert.h
@@ -19,16 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCORE_AUDIOCONVERT_H
-#define AVCORE_AUDIOCONVERT_H
+#ifndef AVUTIL_AUDIOCONVERT_H
+#define AVUTIL_AUDIOCONVERT_H
+
+#include <stdint.h>
/**
* @file
* audio conversion routines
*/
-#include "avcore.h"
-
/* Audio channel masks */
#define AV_CH_FRONT_LEFT 0x00000001
#define AV_CH_FRONT_RIGHT 0x00000002
@@ -92,4 +92,4 @@ void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int6
*/
int av_get_channel_layout_nb_channels(int64_t channel_layout);
-#endif /* AVCORE_AUDIOCONVERT_H */
+#endif /* AVUTIL_AUDIOCONVERT_H */
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index d6338a7..7d1d4cc 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 37
+#define LIBAVUTIL_VERSION_MINOR 38
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -93,6 +93,18 @@ enum AVMediaType {
#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
+#define AV_TIME_BASE 1000000
+#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_OLD_IMAGE_NAMES
+#define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51)
+#endif
+
#include "common.h"
#include "error.h"
#include "mathematics.h"
diff --git a/libavcore/imgutils.c b/libavutil/imgutils.c
similarity index 100%
rename from libavcore/imgutils.c
rename to libavutil/imgutils.c
diff --git a/libavcore/imgutils.h b/libavutil/imgutils.h
similarity index 96%
rename from libavcore/imgutils.h
rename to libavutil/imgutils.h
index 6c39d53..c181863 100644
--- a/libavcore/imgutils.h
+++ b/libavutil/imgutils.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCORE_IMGUTILS_H
-#define AVCORE_IMGUTILS_H
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
/**
* @file
@@ -25,7 +25,7 @@
*/
#include "libavutil/pixdesc.h"
-#include "avcore.h"
+#include "avutil.h"
/**
* Compute the max pixel step for each plane of an image with a
@@ -125,6 +125,8 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
*/
int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
+
#if FF_API_OLD_IMAGE_NAMES
attribute_deprecated
void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
@@ -144,4 +146,4 @@ attribute_deprecated
int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
#endif
-#endif /* AVCORE_IMGUTILS_H */
+#endif /* AVUTIL_IMGUTILS_H */
diff --git a/libavcore/parseutils.c b/libavutil/parseutils.c
similarity index 99%
rename from libavcore/parseutils.c
rename to libavutil/parseutils.c
index abf0422..09eebcf 100644
--- a/libavcore/parseutils.c
+++ b/libavutil/parseutils.c
@@ -18,7 +18,7 @@
/**
* @file
- * misc parsing utilities for libavcore
+ * misc parsing utilities
*/
#include <strings.h>
diff --git a/libavcore/parseutils.h b/libavutil/parseutils.h
similarity index 95%
rename from libavcore/parseutils.h
rename to libavutil/parseutils.h
index 052427b..2c99872 100644
--- a/libavcore/parseutils.h
+++ b/libavutil/parseutils.h
@@ -16,14 +16,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCORE_PARSEUTILS_H
-#define AVCORE_PARSEUTILS_H
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
#include "libavutil/rational.h"
/**
* @file
- * misc parsing utilities for libavcore
+ * misc parsing utilities
*/
/**
@@ -72,4 +72,4 @@ int av_parse_video_rate(AVRational *rate, const char *str);
int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
void *log_ctx);
-#endif /* AVCORE_PARSEUTILS_H */
+#endif /* AVUTIL_PARSEUTILS_H */
diff --git a/libavcore/samplefmt.c b/libavutil/samplefmt.c
similarity index 98%
rename from libavcore/samplefmt.c
rename to libavutil/samplefmt.c
index db6b93c..ea004d9 100644
--- a/libavcore/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -16,9 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcore.h"
#include "samplefmt.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
typedef struct SampleFmtInfo {
const char *name;
int bits;
diff --git a/libavcore/samplefmt.h b/libavutil/samplefmt.h
similarity index 97%
rename from libavcore/samplefmt.h
rename to libavutil/samplefmt.h
index 503e442..9b9c0d4 100644
--- a/libavcore/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCORE_SAMPLEFMT_H
-#define AVCORE_SAMPLEFMT_H
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
-#include "avcore.h"
+#include "avutil.h"
/**
* all in native-endian format
@@ -31,7 +31,7 @@ enum AVSampleFormat {
AV_SAMPLE_FMT_S32, ///< signed 32 bits
AV_SAMPLE_FMT_FLT, ///< float
AV_SAMPLE_FMT_DBL, ///< double
- AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if dynamically linking to libavcore
+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically
};
/**
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 8c5c4b9..6976079 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -20,4 +20,3 @@ TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86
include $(SUBDIR)../subdir.mak
-$(SUBDIR)swscale-test$(EXESUF): ELIBS = -lavcore
diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c
index bd24f3e..7f171ea 100644
--- a/libswscale/swscale-test.c
+++ b/libswscale/swscale-test.c
@@ -25,7 +25,7 @@
#include <stdarg.h>
#undef HAVE_AV_CONFIG_H
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
#include "libavutil/avutil.h"
#include "libavutil/crc.h"
More information about the ffmpeg-cvslog
mailing list