diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 16:37:08 +0300 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-02-15 18:18:21 +0300 |
| commit | 737eb5976f6a37703923ce3c3d5e6ca8eeabb43a (patch) | |
| tree | ab13f1d9bc6e2d47882bb54c50f26f16ecdcf28b /libavutil/avutil.h | |
| parent | 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 (diff) | |
Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavutil/avutil.h')
| -rw-r--r-- | libavutil/avutil.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index d6338a7689..7d1d4ccd0f 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 50 -#define LIBAVUTIL_VERSION_MINOR 37 +#define LIBAVUTIL_VERSION_MINOR 38 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -93,6 +93,18 @@ enum AVMediaType { #define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove +#define AV_NOPTS_VALUE INT64_C(0x8000000000000000) +#define AV_TIME_BASE 1000000 +#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} + +/** + * Those FF_API_* defines are not part of public API. + * They may change, break or disappear at any time. + */ +#ifndef FF_API_OLD_IMAGE_NAMES +#define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51) +#endif + #include "common.h" #include "error.h" #include "mathematics.h" |