xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge libavcore into libavutil

Browse Source 
Done to keep ABI compatible. Otherwise this is just silly
This commit is contained in:
Reinhard Tartler 2011-02-07 14:37:08 +01:00 committed by Michael Niedermayer
parent fad8143f5b
commit 7ffe76e540
121 changed files with 167 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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

2
cmdutils.c
View 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);

2
common.mak
View 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)

13
configure vendored
View File

@ -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"

4
doc/APIchanges
View 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

2
doc/general.texi
View 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},

6
ffmpeg.c
View File

@ -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"

6
ffplay.c
View File

@ -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"

2
ffserver.c
View 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>

2
libavcodec/Makefile
View 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

2
libavcodec/aacdectab.h
View 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>

2
libavcodec/ac3_parser.c
View 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

2
libavcodec/ac3enc.c
View 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"

2
libavcodec/ac3tab.c
View 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"

2
libavcodec/alsdec.c
View 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>

2
libavcodec/apedec.c
View File

@ -25,7 +25,7 @@
#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
#include "libavcore/audioconvert.h"
#include "libavutil/audioconvert.h"
/**
* @file

2
libavcodec/audioconvert.c
View 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"

2
libavcodec/audioconvert.h
View 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
/**

4
libavcodec/avcodec.h
View 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

2
libavcodec/bink.c
View 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"

2
libavcodec/bmpenc.c
View 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"

2
libavcodec/cook.c
View 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"

2
libavcodec/dca.c
View 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"

2
libavcodec/dirac.c
View 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"

2
libavcodec/dnxhddec.c
View 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"

2
libavcodec/dpx.c
View File

@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"

2
libavcodec/dsputil.c
View 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"

2
libavcodec/eacmv.c
View File

@ -29,7 +29,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
typedef struct CmvContext {

2
libavcodec/eamad.c
View 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 */

2
libavcodec/eatgv.c
View 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')

2
libavcodec/flvdec.c
View 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);

2
libavcodec/gifdec.c
View File

@ -22,7 +22,7 @@
//#define DEBUG
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
#include "lzw.h"

2
libavcodec/h264.c
View 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"

2
libavcodec/h264_ps.c
View 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"

2
libavcodec/iff.c
View 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"

2
libavcodec/imc.c
View 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"

3
libavcodec/imgconvert.c
View 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"

2
libavcodec/indeo3.c
View 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"

2
libavcodec/kgv1dec.c
View File

@ -25,7 +25,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
typedef struct {

2
libavcodec/libdiracdec.c
View File

@ -28,7 +28,7 @@
* (http://dirac.sourceforge.net/specification.html).
*/
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "libdirac.h"
#undef NDEBUG

2
libavcodec/libopenjpeg.c
View 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

2
libavcodec/libschroedingerdec.c
View 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"

2
libavcodec/libvpxdec.c
View 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 {

2
libavcodec/mjpegdec.c
View 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"

2
libavcodec/mpc7.c
View 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"

2
libavcodec/mpc8.c
View 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"

2
libavcodec/mpegvideo.c
View 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"

2
libavcodec/nellymoserdec.c
View 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"

2
libavcodec/nuv.c
View 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"

2
libavcodec/pcm-mpeg.c
View 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"

2
libavcodec/pcx.c
View 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"

2
libavcodec/pgssubdec.c
View 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

2
libavcodec/pictordec.c
View 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"

2
libavcodec/pngdec.c
View 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"

2
libavcodec/pnm.c
View 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"

2
libavcodec/ptx.c
View File

@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
typedef struct PTXContext {

2
libavcodec/qtrleenc.c
View 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"

3
libavcodec/rawdec.c
View 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];

2
libavcodec/resample.c
View 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;

2
libavcodec/rv10.c
View 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"

2
libavcodec/rv40.c
View File

@ -24,7 +24,7 @@
* RV40 decoder
*/
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "dsputil.h"

2
libavcodec/sgidec.c
View 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"

2
libavcodec/smacker.c
View 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"

2
libavcodec/srtdec.c
View File

@ -20,7 +20,7 @@
*/
#include "libavutil/avstring.h"
#include "libavcore/parseutils.h"
#include "libavutil/parseutils.h"
#include "avcodec.h"
#include "ass.h"

2
libavcodec/sunrast.c
View File

@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#define RT_OLD 0

2
libavcodec/targa.c
View File

@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "targa.h"

2
libavcodec/tiff.c
View 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;

2
libavcodec/truemotion1.c
View File

@ -35,7 +35,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "truemotion1data.h"

2
libavcodec/txd.c
View File

@ -22,7 +22,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "s3tc.h"

9
libavcodec/utils.c
View File

@ -29,10 +29,9 @@
#include "libavutil/integer.h"
#include "libavutil/crc.h"
#include "libavutil/pixdesc.h"
#include "libavcore/audioconvert.h"
#include "libavcore/imgutils.h"
#include "libavcore/internal.h"
#include "libavcore/samplefmt.h"
#include "libavutil/audioconvert.h"
#include "libavutil/imgutils.h"
#include "libavutil/samplefmt.h"
#include "avcodec.h"
#include "dsputil.h"
#include "libavutil/opt.h"
@ -1211,7 +1210,7 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
}
#if LIBAVCODEC_VERSION_MAJOR < 53
#include "libavcore/parseutils.h"
#include "libavutil/parseutils.h"
int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
{

2
libavcodec/vorbis_data.c
View 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 },

2
libavcodec/vp3.c
View 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"

2
libavcodec/vp8.c
View 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"

2
libavcodec/vqavideo.c
View 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

2
libavcodec/wavpack.c
View File

@ -22,7 +22,7 @@
#include "avcodec.h"
#include "get_bits.h"
#include "unary.h"
#include "libavcore/audioconvert.h"
#include "libavutil/audioconvert.h"
/**
* @file

2
libavcodec/xsubdec.c
View 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"

2
libavcodec/yop.c
View File

@ -24,7 +24,7 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcore/imgutils.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "get_bits.h"

20
libavcore/Makefile
View File

@ -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

70
libavcore/avcore.h
View File

@ -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 */

31
libavcore/internal.h
View File

@ -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 */

4
libavcore/libavcore.v
View File

@ -1,4 +0,0 @@
LIBAVCORE_$MAJOR {
global: av_*; ff_*; avcore*;
local: *;
};

41
libavcore/utils.c
View File

@ -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;
}

2
libavdevice/Makefile
View File

@ -1,7 +1,7 @@
include $(SUBDIR)../config.mak
NAME = avdevice
FFLIBS = avformat avcodec avcore avutil
FFLIBS = avformat avcodec avutil
HEADERS = avdevice.h

2
libavdevice/v4l.c
View 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>

2
libavdevice/v4l2.c
View 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;

2
libavfilter/Makefile
View 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

2
libavfilter/asrc_anullsrc.c
View File

@ -22,7 +22,7 @@
*/
#include "avfilter.h"
#include "libavcore/audioconvert.h"
#include "libavutil/audioconvert.h"
typedef struct {
int64_t channel_layout;

4
libavfilter/avfilter.c
View 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"

5
libavfilter/avfilter.h
View 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

6
libavfilter/defaults.c
View 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"

2
libavfilter/vf_crop.c
View 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",

2
libavfilter/vf_cropdetect.c
View 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 {

2
libavfilter/vf_drawbox.c
View 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 };

4
libavfilter/vf_frei0r.c
View 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);

2
libavfilter/vf_gradfun.c
View 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"

2
libavfilter/vf_hflip.c
View 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

2
libavfilter/vf_mp.c
View 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"

2
libavfilter/vf_overlay.c
View 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[] = {

4
libavfilter/vf_pad.c
View 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 };

2
libavfilter/vf_transpose.c
View 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 {

Some files were not shown because too many files have changed in this diff Show More