Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'

* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298': avcodec: Bump micro version after changing public JPEG 2000 defines

Hendrik Leppkes committed 10 years ago

Commit b95534b2 parents 46ff31d e47b8bb2 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-06-26 - xxxxxxx / e47b8bb - lavc 57.48.101 / 57.19.1 - avcodec.h
		19	Adjust values for JPEG 2000 profiles.
		20
18	-------- 8< --------- FFmpeg 3.1 was cut here -------- 8< ---------	21	-------- 8< --------- FFmpeg 3.1 was cut here -------- 8< ---------
19		22
20	2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h	23	2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h

@@ -29,7 +29,7 @@ · 28 unmodified lines
29		29
30	#define LIBAVCODEC_VERSION_MAJOR 57	30	#define LIBAVCODEC_VERSION_MAJOR 57
31	#define LIBAVCODEC_VERSION_MINOR 48	31	#define LIBAVCODEC_VERSION_MINOR 48
32	#define LIBAVCODEC_VERSION_MICRO 100	32	#define LIBAVCODEC_VERSION_MICRO 101
33		33
34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	LIBAVCODEC_VERSION_MINOR, \	35	LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts