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

Showing the changes to libavfilter (1 of 6 files). Show all

Unified · Split

libavfilter/version.h+2−2

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

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code