diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:13:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:17:47 +0200 |
| commit | c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e (patch) | |
| tree | 78fa9adeaca9a49bcca18fbcd2e1114708502b75 | |
| parent | af3fe43d841cb16189a81968dcc589168e92af41 (diff) | |
| parent | add3a6902ea4d459f36655656a1f8daa409118a7 (diff) | |
| download | ffmpeg-c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e.tar.gz | |
Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'
* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
lavu: bump major to 52
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index f45ea7a2ec..fd38aa0671 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -10,7 +10,7 @@ libavresample: 2012-10-05 libpostproc: 2011-04-18 libswresample: 2011-09-19 libswscale: 2011-06-20 -libavutil: 2011-04-18 +libavutil: 2012-10-22 API changes, most recent first: diff --git a/libavutil/version.h b/libavutil/version.h index 472050827b..5542ebd2ca 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -74,8 +74,8 @@ * @{ */ -#define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 77 +#define LIBAVUTIL_VERSION_MAJOR 52 +#define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -112,7 +112,7 @@ #define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) #endif #ifndef FF_API_OLD_AVOPTIONS -#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_OLD_TC_ADJUST_FRAMENUM #define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) |