Merge libavcore into libavutil
authorReinhard Tartler <siretart@tauware.de>
Mon, 7 Feb 2011 13:37:08 +0000 (14:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Feb 2011 22:00:30 +0000 (23:00 +0100)
Done to keep ABI compatible. Otherwise this is just silly

121 files changed:
Makefile
cmdutils.c
common.mak
configure
doc/APIchanges
doc/general.texi
ffmpeg.c
ffplay.c
ffserver.c
libavcodec/Makefile
libavcodec/aacdectab.h
libavcodec/ac3_parser.c
libavcodec/ac3enc.c
libavcodec/ac3tab.c
libavcodec/alsdec.c
libavcodec/apedec.c
libavcodec/audioconvert.c
libavcodec/audioconvert.h
libavcodec/avcodec.h
libavcodec/bink.c
libavcodec/bmpenc.c
libavcodec/cook.c
libavcodec/dca.c
libavcodec/dirac.c
libavcodec/dnxhddec.c
libavcodec/dpx.c
libavcodec/dsputil.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgv.c
libavcodec/flvdec.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kgv1dec.c
libavcodec/libdiracdec.c
libavcodec/libopenjpeg.c
libavcodec/libschroedingerdec.c
libavcodec/libvpxdec.c
libavcodec/mjpegdec.c
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/mpegvideo.c
libavcodec/nellymoserdec.c
libavcodec/nuv.c
libavcodec/pcm-mpeg.c
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnm.c
libavcodec/ptx.c
libavcodec/qtrleenc.c
libavcodec/rawdec.c
libavcodec/resample.c
libavcodec/rv10.c
libavcodec/rv40.c
libavcodec/sgidec.c
libavcodec/smacker.c
libavcodec/srtdec.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/tiff.c
libavcodec/truemotion1.c
libavcodec/txd.c
libavcodec/utils.c
libavcodec/vorbis_data.c
libavcodec/vp3.c
libavcodec/vp8.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xsubdec.c
libavcodec/yop.c
libavcore/Makefile [deleted file]
libavcore/avcore.h [deleted file]
libavcore/internal.h [deleted file]
libavcore/libavcore.v [deleted file]
libavcore/utils.c [deleted file]
libavdevice/Makefile
libavdevice/v4l.c
libavdevice/v4l2.c
libavfilter/Makefile
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_drawbox.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_mp.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_transpose.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_movie.c
libavfilter/vsrc_nullsrc.c
libavformat/Makefile
libavformat/aea.c
libavformat/flic.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/wv.c
libavutil/Makefile
libavutil/audioconvert.c [moved from libavcore/audioconvert.c with 99% similarity]
libavutil/audioconvert.h [moved from libavcore/audioconvert.h with 97% similarity]
libavutil/avutil.h
libavutil/imgutils.c [moved from libavcore/imgutils.c with 100% similarity]
libavutil/imgutils.h [moved from libavcore/imgutils.h with 96% similarity]
libavutil/parseutils.c [moved from libavcore/parseutils.c with 99% similarity]
libavutil/parseutils.h [moved from libavcore/parseutils.h with 95% similarity]
libavutil/samplefmt.c [moved from libavcore/samplefmt.c with 98% similarity]
libavutil/samplefmt.h [moved from libavcore/samplefmt.h with 97% similarity]
libswscale/Makefile
libswscale/swscale-test.c

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
 
index 0679f011b2b089678cb3dfec92aeafe04174c01e..b71272d25521a9f0e4d9964551ae7094dd648a1d 100644 (file)
@@ -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);
index 110f5056c40130475d66930e6355f2f4032d1dab..3d1a1293fbffbcbcf49b7859e1f958016f977b16 100644 (file)
@@ -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)
index 7af0e850dfe6366de747c0f330137146d99d8a27..5adad70c395e8a4dd92c17df34072349720a0a6d 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
@@ -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"
index ce9d51c55043fdd47fe0cac06de29a9fdb8966ec..eb63072d6aa6fefcc625fc364c4a7f4fc964fa39 100644 (file)
@@ -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
 
index 3fc4d00e26d5ce9cb3264cc1edf1bcf58f10dbaa..cd126f98684a8b863ddc0dddb131ae43db30e324 100644 (file)
@@ -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},
index 8788dce406645f7fa61ef7f02f9b674d75ad090e..217cd17b39e8d465e5bef0ba7cc8f3b2ab5d958e 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"
index e97ec78e5cf2692821e9a0f7b8e16fab02af6d61..dbbac5e96a8335be78713c0836b126a0c3fe2340 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"
index 9a3240808b803ab498bb2f14de3018261ed9b773..cbf04aa4a542994bc0101283a8accd013381edbd 100644 (file)
@@ -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>
index 682b62680084f4c2be7351be0a943e35085dba65..930affbb7aa72b4f740b927b01dc63975fa558cd 100644 (file)
@@ -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
 
index 500e8f2ad03716c7459c0cfb513503967d5879e3..0bccb84cb7580085c13d589974d12db2c0a66c3f 100644 (file)
@@ -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>
index bab354d6b963866be8a020d5af4bbf56c0c20fdb..301aadcd84e07ea4a1e44a8409d6b4c8e5129148 100644 (file)
@@ -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
index 851fdc9caf1f474f1d03b8797b39e1900a429d2a..c15fd5109c92d6db3b0968e48105a3cd4fab0a36 100644 (file)
@@ -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"
index 7c0ebcdcd3ca32124c73c84731527ae17ebfb544..f7b030209c636db2f80e9700f9d330e0f038fd96 100644 (file)
@@ -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"
 
index bfc589d26dd9551904edc145b6051d50c1ae296e..41b3f0caf5767b0b973dc0b8dcf53ad7ad6dc44b 100644 (file)
@@ -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>
index e673b88beeba4b4600409d5ebb6e64f9933259c6..05498777b479a43acf87fd7466a6ca9c8128872a 100644 (file)
@@ -25,7 +25,7 @@
 #include "dsputil.h"
 #include "get_bits.h"
 #include "bytestream.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
 
 /**
  * @file
index b29b030644db920536e76cc706d87e1fcc13a5e3..67cacbdcf1c25b23f32bcd052814dedfeaf1b4ab 100644 (file)
@@ -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"
 
index ae6016a611d878de2af93343dd529171fd93a570..5f38cca5134b663ddb621cc49b1e8b1cf64756c3 100644 (file)
@@ -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
 /**
index 6af5066a9e0ece06441acd71e261f29a52a715a3..013f1685804d88ea4db48e4c13bcb4f9696b5fd5 100644 (file)
@@ -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
index 95cfc92721b396cd60c56f5c320eb41c1942280d..b77e9db0f69ef8b6530aa6ad7f25772e5af8ec2c 100644 (file)
@@ -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"
index d424662b5c69a5dc378063401ac0a12720fd9d3e..b8f9047c55f1bc434d252a6b02ba5ffc9f4bed41 100644 (file)
@@ -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"
index 9d3d001297ae596639e121efb7d0009d7b4f71c1..da31e9f520fd877b02d92d65ee54da2fad5a1080 100644 (file)
@@ -53,7 +53,7 @@
 #include "dsputil.h"
 #include "bytestream.h"
 #include "fft.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
 
 #include "cookdata.h"
 
index 67195b1917d211466783e914d3d8f44e516cf009..bdbe018be23e28e8708835e9263469c83419c2d2 100644 (file)
@@ -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"
index bacd1f8e9f8c833613516016ca9cfdd22f7bd6ba..c8dc7a0f6205e155834356da8c6ba54fb90c64eb 100644 (file)
@@ -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"
index 58893acaf9bbf736f8546ce56f93fa2f464e9901..9b37d1d632cf10ec33c8e74f4492408c5451c661 100644 (file)
@@ -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"
index 55ae4e72489a8f666bae3d14153bb6bc85aa48ab..ade4e8cbc07464a99f3d005b9749bbeba62d924b 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
 
index 84714def415ae8d306f86ef34c3b3f9e6928f059..c89e58f5297593f2f84ee13118f89f8977d0f069 100644 (file)
@@ -27,7 +27,7 @@
  * DSP utils
  */
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "simple_idct.h"
index 6770cd195e02f7f9249b137dfffc6c1a19f95666..7f6c2a4577467b58903b9e3a0dd21f5ee72e86b0 100644 (file)
@@ -29,7 +29,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 
 typedef struct CmvContext {
index 1dd3b7975518361e2610b4b4eca88d5373d99b2b..d4881ab843de5a971de0f69efb45c10316d9f6bb 100644 (file)
@@ -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 */
index 075405a9079131ad17862c462506d684ee3c6357..9ad083475bc1ec6f071d107417d771d2035c85fc 100644 (file)
@@ -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')
index b1a757817353c03abcae03d98a26e0161e98b359..cf4dfe43bcd056c26e7f352eddf5c649b5c584fc 100644 (file)
@@ -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);
index 7be284cb14d53657505e9e41d4f48261a4b0c639..39d0db9c240d3236935e7aa3279ef7c0be070d17 100644 (file)
@@ -22,7 +22,7 @@
 
 //#define DEBUG
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "lzw.h"
index e6f9ec9b8ddec6402484c121cee27a9c5380bf2c..5ebf929ee9575a84734a59eb8524197e2253bbbb 100644 (file)
@@ -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"
index 3fe5815ea64893b10c74e83ed136dc943ba36bf9..469d3d8bd29142f2747b1d123c5b9768f63a0685 100644 (file)
@@ -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"
index 18ad7004d96da271cec0bf133d7b9de1f5bf1b36..e64ce1eeb6fb12cd208d17f4f00bbde4b85d41a2 100644 (file)
@@ -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"
index 2b9de0b0215fea5d11b4ab018bf65995b1a81e90..4cbb287a5799aa62565d6e9d97b69c838dc087e7 100644 (file)
@@ -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"
 
index 6b0c049e2a532ce1b14e58bb7a6873b71bd78652..b37c343b93430acd6815f75c22ace4247903a6db 100644 (file)
@@ -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"
index 5c4cd0564a39b47484dd61c08f7e8b058b99304f..c9d8573692292a616b5acf1f03c35fe973d65b40 100644 (file)
@@ -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"
index efc477f37dad5dc7cd20d80ad645b350fe52a10d..2f6a80c2c6a63cc067890dee012ec22c3e766343 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 
 typedef struct {
index 520ec3f03a72a170e26afa74c7198c17a294d720..fb6ff45f0a2c42ed3dad7ea163d5f5fe3334fd29 100644 (file)
@@ -28,7 +28,7 @@
 * (http://dirac.sourceforge.net/specification.html).
 */
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "libdirac.h"
 
 #undef NDEBUG
index 0a9ded896da49e8de88da5f27bd94c1b02519c4a..1f8530c7c6c363ca9653de122d657167888f7b5f 100644 (file)
@@ -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
index e733d9e34d0f64a7b1ce0d4b06daff9bec0f06d6..7603f7e15fea11e58658dda9270ab5ef35b65af3 100644 (file)
@@ -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"
index f912322c50a6c48624932f7ec5f83e821d349079..29b8eec43e4ad73deda3725abf7c4d6d0b5809ed 100644 (file)
@@ -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 {
index dbfd59905be5c1a6bc99664ad13cea1f6ab022a1..d0fc524471058d932bf88ad40d3e79a5e46cedd4 100644 (file)
@@ -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"
index 8bdb9e5813df669bedef39ccd6b1fbaa60957c8b..04657e5ff2b0499495f85186a23dcc113a29109b 100644 (file)
@@ -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"
index 865ffc1b983281192dfebe6cac0dfa40990f0c2f..cf65ffe9047a01c275e810e16a8743ae6f9578b5 100644 (file)
@@ -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"
index c8706bcf604899eec91681a35fc463097ec300ab..efb0365905b4d6eac1eeaee5e32e123c9dfe0238 100644 (file)
@@ -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"
index 80e04ee0a2ad209bdbb3688b877d4ed16221d81e..fd8568d5ab1b1e40b764da05350dcaea911e5937 100644 (file)
@@ -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"
index d53d4578baba08aaf11d3636a635529fccdb3b7c..84ee6af9b392130a45e41d54c14b557c6ebc0fb7 100644 (file)
@@ -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"
index 189b2b5691e5860e8cbf36588fb82f1ed1cae357..030507502d24a0bb19be706b9825af2a4c9e7139 100644 (file)
@@ -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"
 
index cafade2d7dbab749e6cf61dc5346126f0ff52413..d47417e3f7b4a046f595025b721a08a8a2cfcf40 100644 (file)
@@ -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"
index 1ed475787fcfe1f52bff689a2b9928887dd541e6..b7fe5609531b3284a80598fba17d38a79aeec67b 100644 (file)
@@ -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
 
index 59885ae383cfce9da3303cf2881513240c13766b..f1b3607082b4b9f670dda4121acd754fab737152 100644 (file)
@@ -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"
index 4bc5c3705a0d9cd78c25a46f89a52fb22dd0da3d..2f9b343e5b3c2edbdabc80de1acd82c809055401 100644 (file)
@@ -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"
index c104e2342788fee02575868b5d67dea483f114a3..2cbbdf60ea96ad83a7c5562152db85e96fd8ff01 100644 (file)
@@ -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"
 
index 86b06b4aaadc1081016bacde13c0c3475ff16e44..28df0b6f2e2e48d5a3e106f13fa25ad7d7e90572 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 
 typedef struct PTXContext {
index 78149e5ed8d12e588ebc8b7595db2a455d59a954..8815736e87d13d281a4bf4f378176ee895c7e3a8 100644 (file)
@@ -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"
 
index 29cc5e44d80e4cd6379f7c9e07406b3f6d68fbb5..baffceb51bd8568baf21b32489e1de5914ec932d 100644 (file)
@@ -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];
index 272831520dd2608762f3cea052ea3d7020e91ef6..45fba69f456e44f47e950b496af294878d22d7f3 100644 (file)
@@ -27,7 +27,7 @@
 #include "avcodec.h"
 #include "audioconvert.h"
 #include "libavutil/opt.h"
-#include "libavcore/samplefmt.h"
+#include "libavutil/samplefmt.h"
 
 struct AVResampleContext;
 
index f47540d8f12cf877dddc530a07ceab0b95d35408..e6e9afafb01787279543628901aad948bebf91ef 100644 (file)
@@ -25,7 +25,7 @@
  * RV10/RV20 decoder
  */
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
index acebeb7da5ebd53547dfc4092e3d04ee8e3a02bf..5d4aafc0042dda8c1a18aec3ea8c8aad92e9543c 100644 (file)
@@ -24,7 +24,7 @@
  * RV40 decoder
  */
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 
 #include "avcodec.h"
 #include "dsputil.h"
index ac2adfe7caf3e562294c310d107d5ed507237668..96af5c6fc1be8467f1281508ad1b99b310c292f7 100644 (file)
@@ -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"
index 61f16046166d6f838e1707b3cd714578475cd120..e3f00b8415324f72820274c22d2b6dd528a072ca 100644 (file)
@@ -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"
index 30fdc12fe70c205cbee043e8cc3c875272fedae4..af03cc4d1c7962968c288484315783d684e0f042 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/avstring.h"
-#include "libavcore/parseutils.h"
+#include "libavutil/parseutils.h"
 #include "avcodec.h"
 #include "ass.h"
 
index 76b65b356c3af908c15a0c44c2b7555f701371a4..73e4b5b91c985ccf29d5956f31356772ccd9624c 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 
 #define RT_OLD          0
index e6e1ca6f21ab49b4e5c2e68816f800d39a5edbb6..ef6e92bddfa99392834288b5fc28c9988bc92952 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "targa.h"
 
index b012baa99470f12b7a56453db524eecda1a069fc..8295a4b4c0d06b5129bc50749922614c5c332194 100644 (file)
@@ -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;
index 448da84c57a9f7fdf122101f73f131954a3ad2ff..c7d414a648601a825fe4daac1c8deb9f8e83fce1 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 
 #include "truemotion1data.h"
 
index b394e1f5be0d5f01919b37bec8ca6113c6bf19c6..da1f5c1e20c4fa36c437e7ec7cac8d0f5cc59b7d 100644 (file)
@@ -22,7 +22,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "s3tc.h"
 
index 2d62f079c44b3eaff5eca8dd6ada2de45c3c59ae..7fba5c6aeb1d37e483eeaab18ca010b0e814d413 100644 (file)
 #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)
 {
index 783a5daa003dc2ceb24f0be8c915ec7b5887c9df..8fa624168aa4ccdae0469a46d64eb19ff4149600 100644 (file)
@@ -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 },
index 726f18cb9204c2d8d4926cc572d5447454b1ee27..ee41846e740f3e24240ad4a32cda449f6de8e22a 100644 (file)
@@ -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"
index 3cd76249d071bb59c24fd9bbea65a6c65a0f65a3..a66c10d655b3008d74eebbfe6f1bcdfaa08213da 100644 (file)
@@ -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"
index c3b5ba655641269abca4c0545a27068aff3a238b..f0ecda6217ee7b980d1f0d537c1aa4cd8ae6c25e 100644 (file)
@@ -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
index ffb5018c57baeba3ffa8df3fa22826bcd44d2800..d5102320fd0991f5404f1dc1e99b442cc5202f5f 100644 (file)
@@ -22,7 +22,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "unary.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
 
 /**
  * @file
index 872b227d64276ff3136058ebed8bce81be058c83..d24588b8d99a60faf0caed53aa427b1964ca6a52 100644 (file)
@@ -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"
index 6a75e74b7aa318b6b7be7bad9506b7d19d4ffb9e..a117e2d7912210b0248944769b72287694f63ba7 100644 (file)
@@ -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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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;
-}
index 1c0630b38c10fec63b3eb883889e2b50d6533c7b..be28f4a0ade5bdc34cbfd8ac0067950fdcd422d3 100644 (file)
@@ -1,7 +1,7 @@
 include $(SUBDIR)../config.mak
 
 NAME    = avdevice
-FFLIBS  = avformat avcodec avcore avutil
+FFLIBS  = avformat avcodec avutil
 
 HEADERS = avdevice.h
 
index c107684bff0f92548d30db8dec13f70f774433ad..9a155f9df664beab6bf69dbff2a112591942176d 100644 (file)
@@ -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>
index 993e2adceceb23d63595e68473f846ee8c82b19f..1f1a4bcfb83de918b1f425d7a52b6caefe803820 100644 (file)
@@ -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;
 
index 4148064da956f9831f5d34ce91356dd174d943d3..c05f217e25ef6514b9fb140d8bfbce3b61058e41 100644 (file)
@@ -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
index 306e0a3d5a6e384ac4a78796a3be417c3ae92308..4f49c3f1868639dd48a1fc146c2c27268896318e 100644 (file)
@@ -22,7 +22,7 @@
  */
 
 #include "avfilter.h"
-#include "libavcore/audioconvert.h"
+#include "libavutil/audioconvert.h"
 
 typedef struct {
     int64_t channel_layout;
index 4d183294cbd915f045f56d7c4f10baef12c65ad2..039e04bf645100f747ffadcb423f0419b733af19 100644 (file)
@@ -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"
 
index 451d0befffd8c5afde390d71d52480381bea07d1..935214da68746357aca7a53fbd952ac679cd9576 100644 (file)
@@ -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
index 9f245c306fc0105cb185fb67b17d4daa51920a64..1da26304711c23b1d7f19f70ebf69deb9d8aa53e 100644 (file)
@@ -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"
 
index e768fbb59478f9f99d5d84e2e347a8220ef670b2..e02c24fe84c8a05a5882f11007547bd91a76b660 100644 (file)
@@ -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",
index 62c68640a3e46f7d00d8238bf884d00c68e56887..000c8bb2c27162b87f4e7f3651ea3c2c950c5585 100644 (file)
@@ -23,7 +23,7 @@
  * Ported from MPlayer libmpcodecs/vf_cropdetect.c.
  */
 
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 #include "avfilter.h"
 
 typedef struct {
index 40d5e16e1ba40ae6219335e18c133c2ee0cf8a72..3785072920eb844cc032a2849b187203dff0316d 100644 (file)
@@ -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 };
index 03d4f28f2d80ae41084a538f1b272cfb0e85bc41..adccccb95bdd10aad24e2fffafbbc084ce4cf16d 100644 (file)
@@ -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);
index 3a400a04eb4a7a592e13c84af59a1c1c53bb1024..83ed3d79e4025a554203f4d0db0eb1c09385c0b6 100644 (file)
@@ -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"
index 4deb14a53d185517ef08f02b0508e7f5fa6d1373..5250695f3f4ba0e29c59514c4f3c0a2a31748851 100644 (file)
@@ -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
index 4c653e41ce522298b5cd969a7fd5e25805eaf560..484572cb96eba15ab24ee136490071105bdfb1ad 100644 (file)
@@ -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"
index a170e817a289479487bc423f911b7626ec702f77..0eb24b9682e451e5db31201f27606212e7bbd199 100644 (file)
@@ -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[] = {
index 467db5bf68f7a74fd5acca801039953b693958b3..7413071913ad7f00b646fd58c302ef53343c61f5 100644 (file)
@@ -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 };
 
index 272b17ff1aa6883af5394ca6cd5a35615e8d8fdf..ed91aaade5a7e3f4645d19a7a8a42a338c9bf036 100644 (file)
@@ -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 {
index 6845c74c6f2b95da2ad4ebd4745873c6af5ce01e..7b9ae950747d1d8c1204e63b7096145d71fb3ef9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "avfilter.h"
 #include "vsrc_buffer.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 
 typedef struct {
     int64_t           pts;
index 4fd56febaddbd88cd7c7e30de38cd9078b3bdad1..fac30f9a2f272663ebb30e5b7ed3d911cfd55a18 100644 (file)
@@ -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"
 
index 1cd06e13f37f90f8c246c8e481c6f8392929625b..487aa50069fb515281e7fa6ae6fccd6161c15a2b 100644 (file)
@@ -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[] = {
index 1d4e75e75cd8c47287c6faec3304745bdad4ae29..f319031c26eb1eb0aba6bb155436fe6d4eb3d2cd 100644 (file)
@@ -1,7 +1,7 @@
 include $(SUBDIR)../config.mak
 
 NAME = avformat
-FFLIBS = avcodec avcore avutil
+FFLIBS = avcodec avutil
 
 HEADERS = avformat.h avio.h version.h
 
index 8a508ec50ae95ab6c6e8571f8eeccb4c212bc62b..16a11c86af48c22d099741ab9559e256aede5e14 100644 (file)
@@ -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
 
index 2e03c3b3a1faa0205c34f8d6c234f09cdf874c27..5942f721dc23600c14147c4f40bb90f3989d0953 100644 (file)
@@ -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
index a288c7f85f1fde10c60efb531d7129b469fd1fdc..1d0dc38ca8e523f3f80ccae150a3e5a3a509b4df 100644 (file)
@@ -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"
index 6abfdcdc75d00bf95f6fddd5f89d77fa5b9a4082..28279307373e87d1be5aff3df6d96807f52fe192 100644 (file)
@@ -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)
 {
index 182f900f36f5e5638eec71d873696595d95c8631..c9a1f0ed9c1dbcbda1c7bae7072b6a36adf52f01 100644 (file)
  * 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
index fe0302c3b4c0e01d654df085cdc060bf4e9a0bc1..300acb1896d9e1c96fd9e1348158b7684b30580a 100644 (file)
@@ -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                                                          \
similarity index 99%
rename from libavcore/audioconvert.c
rename to libavutil/audioconvert.c
index c7207338a45cb15c933fcbcf64ffff2ad2610214..8bc43f8936aae3dbd4b2061b6b974d841b29eec3 100644 (file)
@@ -23,6 +23,7 @@
  * audio conversion routines
  */
 
+#include "libavutil/avutil.h"
 #include "libavutil/avstring.h"
 #include "audioconvert.h"
 
similarity index 97%
rename from libavcore/audioconvert.h
rename to libavutil/audioconvert.h
index 89e9c55d1708ccc0651258846ba8994bdf873dae..134c6107c9d1e75ebf54fcfd0b21681c195d76de 100644 (file)
  * 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 */
index d6338a768951064ef5d025562bddb780285ea8b0..7d1d4ccd0f3cd67a7a3f294311bf728d831e1f2d 100644 (file)
@@ -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"
similarity index 100%
rename from libavcore/imgutils.c
rename to libavutil/imgutils.c
similarity index 96%
rename from libavcore/imgutils.h
rename to libavutil/imgutils.h
index 6c39d53119aa7069768cf2692f9e7ea316f0b52a..c1818635799ec4089bd0783caa1150029ffa0956 100644 (file)
@@ -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 */
similarity index 99%
rename from libavcore/parseutils.c
rename to libavutil/parseutils.c
index abf0422ff4eab230fb8052a254921a2826f99fa1..09eebcf56f25ea09d3def39231785f29e839042c 100644 (file)
@@ -18,7 +18,7 @@
 
 /**
  * @file
- * misc parsing utilities for libavcore
+ * misc parsing utilities
  */
 
 #include <strings.h>
similarity index 95%
rename from libavcore/parseutils.h
rename to libavutil/parseutils.h
index 052427bbfda5658ef10a217a663ecf3665e352e6..2c99872289fdf0b7e569eeebfcda8aac8aca65d7 100644 (file)
  * 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 */
similarity index 98%
rename from libavcore/samplefmt.c
rename to libavutil/samplefmt.c
index db6b93cd4cda0aaf9ee101d7476a7c03ffba48cf..ea004d926afce150a7b68a8b26985482ac5a0b7a 100644 (file)
  * 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;
similarity index 97%
rename from libavcore/samplefmt.h
rename to libavutil/samplefmt.h
index 503e44280256605a0d0195179f07bada430edf40..9b9c0d49a917c74b1ef33e30fcb587df004ccb5a 100644 (file)
  * 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
 };
 
 /**
index 8c5c4b9da4de3942cfa05000ec24acc7454024e3..697607968677c12ad2b6723d550998c88b862f51 100644 (file)
@@ -20,4 +20,3 @@ TESTPROGS = colorspace swscale
 DIRS = bfin mlib ppc sparc x86
 
 include $(SUBDIR)../subdir.mak
-$(SUBDIR)swscale-test$(EXESUF): ELIBS = -lavcore
index bd24f3e0062014d23dd100eb60c651412020e03c..7f171ea725575c7c98409844f9b13467ed595e2d 100644 (file)
@@ -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"