Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'

* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc': lavf: add a missing bump and APIchanges for the codecpar switch

Derek Buitenhuis committed 10 years ago

Commit 6586f622 parents 3dec7ed 3e8fd932 files · +4 −1Browse files

Unified · Split

2 files

@@ -15,6 +15,9 @@ libavutil: 2015-08-28 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2016-04-11 - xxxxxxx - lavf 57.33.0 - avformat.h
		19	Add AVStream.codecpar, deprecate AVStream.codec.
		20
18	2016-04-02 - xxxxxxx - lavu 55.20.100 - base64.h	21	2016-04-02 - xxxxxxx - lavu 55.20.100 - base64.h
19	Add AV_BASE64_DECODE_SIZE(x) macro.	22	Add AV_BASE64_DECODE_SIZE(x) macro.
20		23

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	#include "libavutil/version.h"	30	#include "libavutil/version.h"
31		31
32	#define LIBAVFORMAT_VERSION_MAJOR 57	32	#define LIBAVFORMAT_VERSION_MAJOR 57
33	#define LIBAVFORMAT_VERSION_MINOR 32	33	#define LIBAVFORMAT_VERSION_MINOR 33
34	#define LIBAVFORMAT_VERSION_MICRO 100	34	#define LIBAVFORMAT_VERSION_MICRO 100
35		35
36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

Keyboard shortcuts