diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:05:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:05:52 +0200 |
| commit | af3fe43d841cb16189a81968dcc589168e92af41 (patch) | |
| tree | 7eff21028da5c97039874b95eed27f3a61c90f97 /libavutil | |
| parent | 7bc6631dd0270941d38d44e6190a47509ef1c801 (diff) | |
| parent | 2b8dd371e4d276ca0d342e82b8b4cc281be0630a (diff) | |
| download | ffmpeg-af3fe43d841cb16189a81968dcc589168e92af41.tar.gz | |
Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'
* commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a':
lavu: postpone recent deprecations until the next major bump
APIchanges: update lavr bump date
avconv: only apply presets when we have an encoder.
atrac3: replace a calculation with FFALIGN()
atrac3: remove unused ATRAC3Context field, sample_rate
atrac3: use sizeof(variable) instead of sizeof(type)
atrac3: simplify MDCT window calculation
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 328034207f..472050827b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -118,16 +118,16 @@ #define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) #endif #ifndef FF_API_PIX_FMT -#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_CONTEXT_SIZE -#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_PIX_FMT_DESC -#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_AV_REVERSE -#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 53) #endif /** |