Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'

* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800': avcodec: bump version after rotation api Conflicts: libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit d062db72 parents 4e4dbb9 21f68c22 files · +2 −2Browse files

Unified · Split

2 files

@@ -26,7 +26,7 @@ API changes, most recent first: · 25 unmodified lines
26	26	Add AV_FRAME_DATA_DISPLAYMATRIX for exporting frame-level
27	27	spatial rendering on video frames for proper display.
28	28
29		−2014-05-xx - xxxxxxx - lavc 55.52.0 - avcodec.h
	29	+2014-05-xx - xxxxxxx - lavc 55.64.100 / 55.53.0 - avcodec.h
30	30	Add AV_PKT_DATA_DISPLAYMATRIX for exporting packet-level
31	31	spatial rendering on video frames for proper display.
32	32

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29	#include "libavutil/version.h"
30	30
31	31	#define LIBAVCODEC_VERSION_MAJOR 55
32		−#define LIBAVCODEC_VERSION_MINOR 63
	32	+#define LIBAVCODEC_VERSION_MINOR 64
33	33	#define LIBAVCODEC_VERSION_MICRO 100
34	34
35	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts