Commit 737eb597 authored by Reinhard Tartler's avatar Reinhard Tartler

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: default avatarReinhard Tartler <siretart@tauware.de>
parent 8ed4cc65
......@@ -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
......
......@@ -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);
......
......@@ -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)
......
......@@ -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"
......@@ -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
......
......@@ -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},
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
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
......
......@@ -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>
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -25,7 +25,7 @@
#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
#include "libavcore/audioconvert.h"
#include "libavutil/audioconvert.h"
/**
* @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"
......
......@@ -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
/**
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -53,7 +53,7 @@
#include "dsputil.h"
#include "bytestream.h"
#include "fft.h"
#include "libavcore/audioconvert.h"
#include "libavutil/audioconvert.h"
#include "cookdata.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"
......
......@@ -27,7 +27,7 @@
* DSP utils
*/
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "dsputil.h"
#include "simple_idct.h"
......
......@@ -29,7 +29,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
typedef struct CmvContext {
......
......@@ -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 */
......
......@@ -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')
......
......@@ -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);
......
......@@ -22,7 +22,7 @@
//#define DEBUG
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
#include "lzw.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -25,7 +25,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
typedef struct {
......
......@@ -28,7 +28,7 @@
* (http://dirac.sourceforge.net/specification.html).
*/
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "libdirac.h"
#undef NDEBUG
......
......@@ -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
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......