mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'
* commit 'add3a6902ea4d459f36655656a1f8daa409118a7': lavu: bump major to 52 Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c2a25e141e
@ -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 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#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 @@
|
|||||||
#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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user