Commit c2a25e14 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'add3a690'

* commit 'add3a690':
  lavu: bump major to 52

Conflicts:
	libavutil/version.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents af3fe43d add3a690
...@@ -10,7 +10,7 @@ libavresample: 2012-10-05 ...@@ -10,7 +10,7 @@ libavresample: 2012-10-05
libpostproc: 2011-04-18 libpostproc: 2011-04-18
libswresample: 2011-09-19 libswresample: 2011-09-19
libswscale: 2011-06-20 libswscale: 2011-06-20
libavutil: 2011-04-18 libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
......
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
* @{ * @{
*/ */
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 77 #define LIBAVUTIL_VERSION_MINOR 0
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) #define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52)
#endif #endif
#ifndef FF_API_OLD_AVOPTIONS #ifndef FF_API_OLD_AVOPTIONS
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 52) #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM #ifndef FF_API_OLD_TC_ADJUST_FRAMENUM
#define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) #define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment