Merge libavcore into libavutil

It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>

diff --git a/Makefile b/Makefile
index 99d264a44675aa132402f914aa45b00f3263710c..4ed003b7a5badd23f1cab48e2d2d6f488b96293a 100644 (file)
--- 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 c68f37fe207b38cd5ef441db35d11c8e313bac37..9809d2fe8a0af7522864ca2365a492fd2a28063c 100644 (file)
--- 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 110f5056c40130475d66930e6355f2f4032d1dab..3d1a1293fbffbcbcf49b7859e1f958016f977b16 100644 (file)
--- 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 90eeaa0b663c3555713d5b3905b33892406980ec..ed2934d33f6da63f6b67ddfe802c6a93c8ec932c 100755 (executable)
--- 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
@@ -1589,7 +1587,6 @@ host_os=$target_os_default
 
 # configurable options
 enable avcodec
-enable avcore
 enable avdevice
 enable avfilter
 enable avformat
@@ -2933,7 +2930,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
@@ -3143,7 +3140,6 @@ if enabled source_path_used; then
         doc
         libavcodec
         libavcodec/$arch
-        libavcore
         libavdevice
         libavfilter
         libavfilter/$arch
@@ -3163,7 +3159,6 @@ if enabled source_path_used; then
         doc/texi2pod.pl
         libavcodec/Makefile
         libavcodec/${arch}/Makefile
-        libavcore/Makefile
         libavdevice/Makefile
         libavfilter/Makefile
         libavfilter/${arch}/Makefile
@@ -3266,7 +3261,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
@@ -3394,10 +3388,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 ce61cfcf7255e6972d53f38b27dedc12dff6ba2e..421df01336db040968c7bbf4cf0ab5a776896468 100644 (file)
--- 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 3fc4d00e26d5ce9cb3264cc1edf1bcf58f10dbaa..cd126f98684a8b863ddc0dddb131ae43db30e324 100644 (file)
--- 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 85149a79356feb58a02644d1f66281b8bcdacbfc..1cad57d809a59ef1b747d65a7b8ba60183c83c7f 100644 (file)
--- 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 6b4f38ee35e59749fcebcf39d4f15f41c00fc70c..b6343287ac77970bcf68d51a6cfdef7545bf4c72 100644 (file)
--- 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 9a3240808b803ab498bb2f14de3018261ed9b773..cbf04aa4a542994bc0101283a8accd013381edbd 100644 (file)
--- 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 682b62680084f4c2be7351be0a943e35085dba65..930affbb7aa72b4f740b927b01dc63975fa558cd 100644 (file)
--- 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 500e8f2ad03716c7459c0cfb513503967d5879e3..0bccb84cb7580085c13d589974d12db2c0a66c3f 100644 (file)
--- 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 bab354d6b963866be8a020d5af4bbf56c0c20fdb..301aadcd84e07ea4a1e44a8409d6b4c8e5129148 100644 (file)
--- 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 851fdc9caf1f474f1d03b8797b39e1900a429d2a..c15fd5109c92d6db3b0968e48105a3cd4fab0a36 100644 (file)
--- 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 7c0ebcdcd3ca32124c73c84731527ae17ebfb544..f7b030209c636db2f80e9700f9d330e0f038fd96 100644 (file)
--- 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 bfc589d26dd9551904edc145b6051d50c1ae296e..41b3f0caf5767b0b973dc0b8dcf53ad7ad6dc44b 100644 (file)
--- 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 e673b88beeba4b4600409d5ebb6e64f9933259c6..05498777b479a43acf87fd7466a6ca9c8128872a 100644 (file)
--- 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 b29b030644db920536e76cc706d87e1fcc13a5e3..67cacbdcf1c25b23f32bcd052814dedfeaf1b4ab 100644 (file)
--- 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 ae6016a611d878de2af93343dd529171fd93a570..5f38cca5134b663ddb621cc49b1e8b1cf64756c3 100644 (file)
--- 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 9ed6f508568f51a02777f3d64377175655a088aa..84c3b6fc7969ee8f2cadde4bd689c1874e80a15c 100644 (file)
--- 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 95cfc92721b396cd60c56f5c320eb41c1942280d..b77e9db0f69ef8b6530aa6ad7f25772e5af8ec2c 100644 (file)
--- 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 d424662b5c69a5dc378063401ac0a12720fd9d3e..b8f9047c55f1bc434d252a6b02ba5ffc9f4bed41 100644 (file)
--- 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 9d3d001297ae596639e121efb7d0009d7b4f71c1..da31e9f520fd877b02d92d65ee54da2fad5a1080 100644 (file)
--- 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 67195b1917d211466783e914d3d8f44e516cf009..bdbe018be23e28e8708835e9263469c83419c2d2 100644 (file)
--- 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 bacd1f8e9f8c833613516016ca9cfdd22f7bd6ba..c8dc7a0f6205e155834356da8c6ba54fb90c64eb 100644 (file)
--- 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 58893acaf9bbf736f8546ce56f93fa2f464e9901..9b37d1d632cf10ec33c8e74f4492408c5451c661 100644 (file)
--- 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 55ae4e72489a8f666bae3d14153bb6bc85aa48ab..ade4e8cbc07464a99f3d005b9749bbeba62d924b 100644 (file)
--- 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 84714def415ae8d306f86ef34c3b3f9e6928f059..c89e58f5297593f2f84ee13118f89f8977d0f069 100644 (file)
--- 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 6770cd195e02f7f9249b137dfffc6c1a19f95666..7f6c2a4577467b58903b9e3a0dd21f5ee72e86b0 100644 (file)
--- 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 1dd3b7975518361e2610b4b4eca88d5373d99b2b..d4881ab843de5a971de0f69efb45c10316d9f6bb 100644 (file)
--- 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 075405a9079131ad17862c462506d684ee3c6357..9ad083475bc1ec6f071d107417d771d2035c85fc 100644 (file)
--- 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 b1a757817353c03abcae03d98a26e0161e98b359..cf4dfe43bcd056c26e7f352eddf5c649b5c584fc 100644 (file)
--- 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 7be284cb14d53657505e9e41d4f48261a4b0c639..39d0db9c240d3236935e7aa3279ef7c0be070d17 100644 (file)
--- 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 e6f9ec9b8ddec6402484c121cee27a9c5380bf2c..5ebf929ee9575a84734a59eb8524197e2253bbbb 100644 (file)
--- 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 3fe5815ea64893b10c74e83ed136dc943ba36bf9..469d3d8bd29142f2747b1d123c5b9768f63a0685 100644 (file)
--- 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 18ad7004d96da271cec0bf133d7b9de1f5bf1b36..e64ce1eeb6fb12cd208d17f4f00bbde4b85d41a2 100644 (file)
--- 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 2b9de0b0215fea5d11b4ab018bf65995b1a81e90..4cbb287a5799aa62565d6e9d97b69c838dc087e7 100644 (file)
--- 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 6b0c049e2a532ce1b14e58bb7a6873b71bd78652..b37c343b93430acd6815f75c22ace4247903a6db 100644 (file)
--- 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 5c4cd0564a39b47484dd61c08f7e8b058b99304f..c9d8573692292a616b5acf1f03c35fe973d65b40 100644 (file)
--- 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 efc477f37dad5dc7cd20d80ad645b350fe52a10d..2f6a80c2c6a63cc067890dee012ec22c3e766343 100644 (file)
--- 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 520ec3f03a72a170e26afa74c7198c17a294d720..fb6ff45f0a2c42ed3dad7ea163d5f5fe3334fd29 100644 (file)
--- 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 0a9ded896da49e8de88da5f27bd94c1b02519c4a..1f8530c7c6c363ca9653de122d657167888f7b5f 100644 (file)
--- 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 e733d9e34d0f64a7b1ce0d4b06daff9bec0f06d6..7603f7e15fea11e58658dda9270ab5ef35b65af3 100644 (file)
--- 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 f912322c50a6c48624932f7ec5f83e821d349079..29b8eec43e4ad73deda3725abf7c4d6d0b5809ed 100644 (file)
--- 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 fbc637aa30e1b5b99a157f51cfa61d0f205133aa..69a1837472e93a478fd394480e50402b2a60e04f 100644 (file)
--- 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 8bdb9e5813df669bedef39ccd6b1fbaa60957c8b..04657e5ff2b0499495f85186a23dcc113a29109b 100644 (file)
--- 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 865ffc1b983281192dfebe6cac0dfa40990f0c2f..cf65ffe9047a01c275e810e16a8743ae6f9578b5 100644 (file)
--- 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 c8706bcf604899eec91681a35fc463097ec300ab..efb0365905b4d6eac1eeaee5e32e123c9dfe0238 100644 (file)
--- 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 80e04ee0a2ad209bdbb3688b877d4ed16221d81e..fd8568d5ab1b1e40b764da05350dcaea911e5937 100644 (file)
--- 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 d53d4578baba08aaf11d3636a635529fccdb3b7c..84ee6af9b392130a45e41d54c14b557c6ebc0fb7 100644 (file)
--- 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 189b2b5691e5860e8cbf36588fb82f1ed1cae357..030507502d24a0bb19be706b9825af2a4c9e7139 100644 (file)
--- 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 cafade2d7dbab749e6cf61dc5346126f0ff52413..d47417e3f7b4a046f595025b721a08a8a2cfcf40 100644 (file)
--- 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 1ed475787fcfe1f52bff689a2b9928887dd541e6..b7fe5609531b3284a80598fba17d38a79aeec67b 100644 (file)
--- 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 59885ae383cfce9da3303cf2881513240c13766b..f1b3607082b4b9f670dda4121acd754fab737152 100644 (file)
--- 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 4bc5c3705a0d9cd78c25a46f89a52fb22dd0da3d..2f9b343e5b3c2edbdabc80de1acd82c809055401 100644 (file)
--- 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 c104e2342788fee02575868b5d67dea483f114a3..2cbbdf60ea96ad83a7c5562152db85e96fd8ff01 100644 (file)
--- 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 86b06b4aaadc1081016bacde13c0c3475ff16e44..28df0b6f2e2e48d5a3e106f13fa25ad7d7e90572 100644 (file)
--- 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 78149e5ed8d12e588ebc8b7595db2a455d59a954..8815736e87d13d281a4bf4f378176ee895c7e3a8 100644 (file)
--- 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 29cc5e44d80e4cd6379f7c9e07406b3f6d68fbb5..baffceb51bd8568baf21b32489e1de5914ec932d 100644 (file)
--- 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 272831520dd2608762f3cea052ea3d7020e91ef6..45fba69f456e44f47e950b496af294878d22d7f3 100644 (file)
--- 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 f47540d8f12cf877dddc530a07ceab0b95d35408..e6e9afafb01787279543628901aad948bebf91ef 100644 (file)
--- 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 acebeb7da5ebd53547dfc4092e3d04ee8e3a02bf..5d4aafc0042dda8c1a18aec3ea8c8aad92e9543c 100644 (file)
--- 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 ac2adfe7caf3e562294c310d107d5ed507237668..96af5c6fc1be8467f1281508ad1b99b310c292f7 100644 (file)
--- 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 61f16046166d6f838e1707b3cd714578475cd120..e3f00b8415324f72820274c22d2b6dd528a072ca 100644 (file)
--- 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 30fdc12fe70c205cbee043e8cc3c875272fedae4..af03cc4d1c7962968c288484315783d684e0f042 100644 (file)
--- 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 76b65b356c3af908c15a0c44c2b7555f701371a4..73e4b5b91c985ccf29d5956f31356772ccd9624c 100644 (file)
--- 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 e6e1ca6f21ab49b4e5c2e68816f800d39a5edbb6..ef6e92bddfa99392834288b5fc28c9988bc92952 100644 (file)
--- 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 b012baa99470f12b7a56453db524eecda1a069fc..8295a4b4c0d06b5129bc50749922614c5c332194 100644 (file)
--- 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 448da84c57a9f7fdf122101f73f131954a3ad2ff..c7d414a648601a825fe4daac1c8deb9f8e83fce1 100644 (file)
--- 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 b394e1f5be0d5f01919b37bec8ca6113c6bf19c6..da1f5c1e20c4fa36c437e7ec7cac8d0f5cc59b7d 100644 (file)
--- 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 c4bba376bb7a637bbfc0cf1c1e503d9dcef15206..03fa7baeb53fd854125e2aa7b9d932cd213add05 100644 (file)
--- 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 783a5daa003dc2ceb24f0be8c915ec7b5887c9df..8fa624168aa4ccdae0469a46d64eb19ff4149600 100644 (file)
--- 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 726f18cb9204c2d8d4926cc572d5447454b1ee27..ee41846e740f3e24240ad4a32cda449f6de8e22a 100644 (file)
--- 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 3cd76249d071bb59c24fd9bbea65a6c65a0f65a3..a66c10d655b3008d74eebbfe6f1bcdfaa08213da 100644 (file)
--- 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 c3b5ba655641269abca4c0545a27068aff3a238b..f0ecda6217ee7b980d1f0d537c1aa4cd8ae6c25e 100644 (file)
--- 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 ffb5018c57baeba3ffa8df3fa22826bcd44d2800..d5102320fd0991f5404f1dc1e99b442cc5202f5f 100644 (file)
--- 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 872b227d64276ff3136058ebed8bce81be058c83..d24588b8d99a60faf0caed53aa427b1964ca6a52 100644 (file)
--- 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 6a75e74b7aa318b6b7be7bad9506b7d19d4ffb9e..a117e2d7912210b0248944769b72287694f63ba7 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 1c0630b38c10fec63b3eb883889e2b50d6533c7b..be28f4a0ade5bdc34cbfd8ac0067950fdcd422d3 100644 (file)
--- 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 c107684bff0f92548d30db8dec13f70f774433ad..9a155f9df664beab6bf69dbff2a112591942176d 100644 (file)
--- 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 993e2adceceb23d63595e68473f846ee8c82b19f..1f1a4bcfb83de918b1f425d7a52b6caefe803820 100644 (file)
--- 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 ce1caa5bdcbdef3067204d940c5cb336dc10c498..abb68c811d15fceb8e66ee74f1d4a7ed8cc2df03 100644 (file)
--- 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
 

diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 306e0a3d5a6e384ac4a78796a3be417c3ae92308..4f49c3f1868639dd48a1fc146c2c27268896318e 100644 (file)
--- 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 4d183294cbd915f045f56d7c4f10baef12c65ad2..039e04bf645100f747ffadcb423f0419b733af19 100644 (file)
--- 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 451d0befffd8c5afde390d71d52480381bea07d1..935214da68746357aca7a53fbd952ac679cd9576 100644 (file)
--- 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 9f245c306fc0105cb185fb67b17d4daa51920a64..1da26304711c23b1d7f19f70ebf69deb9d8aa53e 100644 (file)
--- 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 e768fbb59478f9f99d5d84e2e347a8220ef670b2..e02c24fe84c8a05a5882f11007547bd91a76b660 100644 (file)
--- 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 62c68640a3e46f7d00d8238bf884d00c68e56887..000c8bb2c27162b87f4e7f3651ea3c2c950c5585 100644 (file)
--- 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 40d5e16e1ba40ae6219335e18c133c2ee0cf8a72..3785072920eb844cc032a2849b187203dff0316d 100644 (file)
--- 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 03d4f28f2d80ae41084a538f1b272cfb0e85bc41..adccccb95bdd10aad24e2fffafbbc084ce4cf16d 100644 (file)
--- 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 3a400a04eb4a7a592e13c84af59a1c1c53bb1024..83ed3d79e4025a554203f4d0db0eb1c09385c0b6 100644 (file)
--- 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 4deb14a53d185517ef08f02b0508e7f5fa6d1373..5250695f3f4ba0e29c59514c4f3c0a2a31748851 100644 (file)
--- 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_overlay.c b/libavfilter/vf_overlay.c
index a170e817a289479487bc423f911b7626ec702f77..0eb24b9682e451e5db31201f27606212e7bbd199 100644 (file)
--- 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 467db5bf68f7a74fd5acca801039953b693958b3..7413071913ad7f00b646fd58c302ef53343c61f5 100644 (file)
--- 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 272b17ff1aa6883af5394ca6cd5a35615e8d8fdf..ed91aaade5a7e3f4645d19a7a8a42a338c9bf036 100644 (file)
--- 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 74d9bf62015bdd1c74217a57db94af3f8973a4a7..3c48a71c716ad9221fafc266378a6b3f9e670cb6 100644 (file)
--- 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 4fd56febaddbd88cd7c7e30de38cd9078b3bdad1..fac30f9a2f272663ebb30e5b7ed3d911cfd55a18 100644 (file)
--- 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 1cd06e13f37f90f8c246c8e481c6f8392929625b..487aa50069fb515281e7fa6ae6fccd6161c15a2b 100644 (file)
--- 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 1d4e75e75cd8c47287c6faec3304745bdad4ae29..f319031c26eb1eb0aba6bb155436fe6d4eb3d2cd 100644 (file)
--- 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 8a508ec50ae95ab6c6e8571f8eeccb4c212bc62b..16a11c86af48c22d099741ab9559e256aede5e14 100644 (file)
--- 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 2e03c3b3a1faa0205c34f8d6c234f09cdf874c27..5942f721dc23600c14147c4f40bb90f3989d0953 100644 (file)
--- 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 a288c7f85f1fde10c60efb531d7129b469fd1fdc..1d0dc38ca8e523f3f80ccae150a3e5a3a509b4df 100644 (file)
--- 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 2303244d4c6f38f9e59a03fd5c25a37ff9017cb5..225b9f22da70592e68e8ddff8c6f27b94621cd13 100644 (file)
--- 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 182f900f36f5e5638eec71d873696595d95c8631..c9a1f0ed9c1dbcbda1c7bae7072b6a36adf52f01 100644 (file)
--- 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 fe0302c3b4c0e01d654df085cdc060bf4e9a0bc1..300acb1896d9e1c96fd9e1348158b7684b30580a 100644 (file)
--- 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 c7207338a45cb15c933fcbcf64ffff2ad2610214..8bc43f8936aae3dbd4b2061b6b974d841b29eec3 100644 (file)
--- 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 89e9c55d1708ccc0651258846ba8994bdf873dae..134c6107c9d1e75ebf54fcfd0b21681c195d76de 100644 (file)
--- 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 d6338a768951064ef5d025562bddb780285ea8b0..7d1d4ccd0f3cd67a7a3f294311bf728d831e1f2d 100644 (file)
--- 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 6c39d53119aa7069768cf2692f9e7ea316f0b52a..c1818635799ec4089bd0783caa1150029ffa0956 100644 (file)
--- 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 abf0422ff4eab230fb8052a254921a2826f99fa1..09eebcf56f25ea09d3def39231785f29e839042c 100644 (file)
--- 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 052427bbfda5658ef10a217a663ecf3665e352e6..2c99872289fdf0b7e569eeebfcda8aac8aca65d7 100644 (file)
--- 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 97%
rename from libavcore/samplefmt.c
rename to libavutil/samplefmt.c
index 532acd9507907048762ad9492365695fe3c8bac7..c9ffd1ac5547b77916494b63df0bd6a33efbe95a 100644 (file)
--- 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 93%
rename from libavcore/samplefmt.h
rename to libavutil/samplefmt.h
index 9701efe7bea354bb411aff0ff745e59be2b38b0f..0604580a7ae562c3ed91b8cad9356aa9907e2e65 100644 (file)
--- a/libavcore/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -16,10 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCORE_SAMPLEFMT_H
-#define AVCORE_SAMPLEFMT_H
-
-#include "avcore.h"
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
 
 /**
  * all in native-endian format
@@ -31,7 +29,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
 };
 
 /**
@@ -69,4 +67,4 @@ char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat samp
  */
 int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
 
-#endif /* AVCORE_SAMPLEFMT_H */
+#endif /* AVUTIL_SAMPLEFMT_H */

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 8c5c4b9da4de3942cfa05000ec24acc7454024e3..697607968677c12ad2b6723d550998c88b862f51 100644 (file)
--- 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 bd24f3e0062014d23dd100eb60c651412020e03c..7f171ea725575c7c98409844f9b13467ed595e2d 100644 (file)
--- 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"