mirror of https://github.com/FFmpeg/FFmpeg.git
It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>oldabi
Reinhard Tartler
14 years ago
parent
8ed4cc65a1
commit
737eb5976f
120 changed files with 166 additions and 321 deletions
@ -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 |
||||
@ -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 */ |
||||
@ -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 */ |
||||
@ -1,4 +0,0 @@ |
||||
LIBAVCORE_$MAJOR { |
||||
global: av_*; ff_*; avcore*; |
||||
local: *; |
||||
}; |
||||
@ -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; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue