Merge commit '577326d430593a25456393a75212b95d1cd94131'

* commit '577326d430593a25456393a75212b95d1cd94131': lavc: deprecate refcounted_frames field

James Almer committed 9 years ago

Commit b1cf1512 parents e7c9185 577326d3 files · +8 −1Browse files

Unified · Split

3 files

doc/APIchanges +6 −0
libavcodec/avcodec.h +1 −0
libavcodec/version.h +1 −1

doc/APIchanges+6−0

@@ -15,6 +15,12 @@ libavutil: 2015-08-28 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2017-09-26 - xxxxxxx - lavc 57.106.102 - avcodec.h
	19	+ Deprecate AVCodecContext.refcounted_frames. This was useful for deprecated
	20	+ API only (avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
	21	+ (avcodec_send_packet/avcodec_receive_frame) always work with reference
	22	+ counted frames.
	23	+
18	24	2017-xx-xx - xxxxxxx - lavu 55.76.100 / 56.6.0 - pixdesc.h
19	25	Add av_color_range_from_name(), av_color_primaries_from_name(),
20	26	av_color_transfer_from_name(), av_color_space_from_name(), and

libavcodec/avcodec.h+1−0

@@ -2683,6 +2683,7 @@ typedef struct AVCodecContext { · 2682 unmodified lines
2683	2683	* - encoding: unused
2684	2684	* - decoding: set by the caller before avcodec_open2().
2685	2685	*/
	2686	+ attribute_deprecated
2686	2687	int refcounted_frames;
2687	2688
2688	2689	/* - encoding parameters */

libavcodec/version.h+1−1

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