Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h

Michael Niedermayer committed 13 years ago

Commit a75f01d2 parents c292e34 d8b31be6 files · +48 −13Browse files

Unified · Split

6 files

Changelog +1 −0
doc/APIchanges +37 −3
libavcodec/version.h +2 −2
libavdevice/version.h +2 −2
libavfilter/version.h +2 −2
libavformat/version.h +4 −4

Changelog+1−0

@@ -3,6 +3,7 @@ releases are sorted from youngest to oldest. · 2 unmodified lines
3		3
4	version <next>:	4	version <next>:
5	- curves filter	5	- curves filter
		6	- reference-counting for AVFrame and AVPacket data
6		7
7		8
8	version 1.2:	9	version 1.2:

doc/APIchanges+37−3

@@ -2,10 +2,10 @@ Never assume the API of libav* to be stable unless at least 1 month has passed · 1 unmodified line
2	since the last major version increase or the API was added.	2	since the last major version increase or the API was added.
3		3
4	The last version increases were:	4	The last version increases were:
5	libavcodec: 2012-01-27	5	libavcodec: 2013-03-xx
6	libavdevice: 2011-04-18	6	libavdevice: 2013-03-xx
7	libavfilter: 2012-06-22	7	libavfilter: 2012-06-22
8	libavformat: 2012-01-27	8	libavformat: 2013-03-xx
9	libavresample: 2012-10-05	9	libavresample: 2012-10-05
10	libpostproc: 2011-04-18	10	libpostproc: 2011-04-18
11	libswresample: 2011-09-19	11	libswresample: 2011-09-19
@@ -144,6 +144,40 @@ API changes, most recent first: · 132 unmodified lines
144	2012-03-26 - a67d9cf - lavfi 2.66.100	144	2012-03-26 - a67d9cf - lavfi 2.66.100
145	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.	145	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
146		146
		147	2013-03-xx - Reference counted buffers - lavu 52.8.0, lavc 55.0.0, lavf 55.0.0,
		148	lavd 54.0.0, lavfi 3.5.0
		149	xxxxxxx, xxxxxxx - add a new API for reference counted buffers and buffer
		150	pools (new header libavutil/buffer.h).
		151	xxxxxxx - add AVPacket.buf to allow reference counting for the AVPacket data.
		152	Add av_packet_from_data() function for constructing packets from
		153	av_malloc()ed data.
		154	xxxxxxx - move AVFrame from lavc to lavu (new header libavutil/frame.h), add
		155	AVFrame.buf/extended_buf to allow reference counting for the AVFrame
		156	data. Add new API for working with reference-counted AVFrames.
		157	xxxxxxx - add the refcounted_frames field to AVCodecContext to make audio and
		158	video decoders return reference-counted frames. Add get_buffer2()
		159	callback to AVCodecContext which allocates reference-counted frames.
		160	Add avcodec_default_get_buffer2() as the default get_buffer2()
		161	implementation.
		162	Deprecate AVCodecContext.get_buffer() / release_buffer() /
		163	reget_buffer(), avcodec_default_get_buffer(),
		164	avcodec_default_reget_buffer(), avcodec_default_release_buffer().
		165	Remove avcodec_default_free_buffers(), which should not have ever
		166	been called from outside of lavc.
		167	Deprecate the following AVFrame fields:
		168	* base -- is now stored in AVBufferRef
		169	* reference, type, buffer_hints -- are unnecessary in the new API
		170	* hwaccel_picture_private, owner, thread_opaque -- should not
		171	have been acessed from outside of lavc
		172	* qscale_table, qstride, qscale_type, mbskip_table, motion_val,
		173	mb_type, dct_coeff, ref_index -- mpegvideo-specific tables,
		174	which are not exported anymore.
		175	xxxxxxx - switch libavfilter to use AVFrame instead of AVFilterBufferRef. Add
		176	av_buffersrc_add_frame(), deprecate av_buffersrc_buffer().
		177	Add av_buffersink_get_frame() and av_buffersink_get_samples(),
		178	deprecate av_buffersink_read() and av_buffersink_read_samples().
		179	Deprecate AVFilterBufferRef and all functions for working with it.
		180
147	2013-xx-xx - xxxxxxx - lavu 52.8.0 - avstring.h	181	2013-xx-xx - xxxxxxx - lavu 52.8.0 - avstring.h
148	Add av_isdigit, av_isgraph, av_isspace, av_isxdigit.	182	Add av_isdigit, av_isgraph, av_isspace, av_isxdigit.
149		183

libavcodec/version.h+2−2

@@ -28,8 +28,8 @@ · 27 unmodified lines
28		28
29	#include "libavutil/avutil.h"	29	#include "libavutil/avutil.h"
30		30
31	#define LIBAVCODEC_VERSION_MAJOR 54	31	#define LIBAVCODEC_VERSION_MAJOR 55
32	#define LIBAVCODEC_VERSION_MINOR 92	32	#define LIBAVCODEC_VERSION_MINOR 0
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 100
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

libavdevice/version.h+2−2

@@ -28,8 +28,8 @@ · 27 unmodified lines
28	#include "libavutil/avutil.h"	28	#include "libavutil/avutil.h"
29		29
30	#define LIBAVDEVICE_VERSION_MAJOR 54	30	#define LIBAVDEVICE_VERSION_MAJOR 54
31	#define LIBAVDEVICE_VERSION_MINOR 3	31	#define LIBAVDEVICE_VERSION_MINOR 4
32	#define LIBAVDEVICE_VERSION_MICRO 103	32	#define LIBAVDEVICE_VERSION_MICRO 100
33		33
34	#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \	34	#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
35	LIBAVDEVICE_VERSION_MINOR, \	35	LIBAVDEVICE_VERSION_MINOR, \

libavfilter/version.h+2−2

@@ -29,8 +29,8 @@ · 28 unmodified lines
29	#include "libavutil/avutil.h"	29	#include "libavutil/avutil.h"
30		30
31	#define LIBAVFILTER_VERSION_MAJOR 3	31	#define LIBAVFILTER_VERSION_MAJOR 3
32	#define LIBAVFILTER_VERSION_MINOR 44	32	#define LIBAVFILTER_VERSION_MINOR 45
33	#define LIBAVFILTER_VERSION_MICRO 101	33	#define LIBAVFILTER_VERSION_MICRO 100
34		34
35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
36	LIBAVFILTER_VERSION_MINOR, \	36	LIBAVFILTER_VERSION_MINOR, \

libavformat/version.h+4−4

@@ -29,9 +29,9 @@ · 28 unmodified lines
29		29
30	#include "libavutil/avutil.h"	30	#include "libavutil/avutil.h"
31		31
32	#define LIBAVFORMAT_VERSION_MAJOR 54	32	#define LIBAVFORMAT_VERSION_MAJOR 55
33	#define LIBAVFORMAT_VERSION_MINOR 63	33	#define LIBAVFORMAT_VERSION_MINOR 0
34	#define LIBAVFORMAT_VERSION_MICRO 104	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, \
37	LIBAVFORMAT_VERSION_MINOR, \	37	LIBAVFORMAT_VERSION_MINOR, \
@@ -83,7 +83,7 @@ · 45 unmodified lines
83	#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)	83	#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)
84	#endif	84	#endif
85	#ifndef FF_API_R_FRAME_RATE	85	#ifndef FF_API_R_FRAME_RATE
86	#define FF_API_R_FRAME_RATE (LIBAVFORMAT_VERSION_MAJOR < 55)	86	#define FF_API_R_FRAME_RATE 1
87	#endif	87	#endif
88		88
89	#endif /* AVFORMAT_VERSION_H */	89	#endif /* AVFORMAT_VERSION_H */

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code