Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'

* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0': AVOptions: deprecate unused AV_OPT_FLAG_METADATA Conflicts: doc/APIchanges libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit f4c8d002 parents ca9f7e1 6bb87203 files · +9 −1Browse files

Unified · Split

3 files

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2014-xx-xx - xxxxxxx - lavu 53.03.01 - opt.h
	19	+ Deprecate unused AV_OPT_FLAG_METADATA.
	20	+
18	21	2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h
19	22	Add avdevice_list_devices() and avdevice_free_list_devices()
20	23

@@ -282,7 +282,9 @@ typedef struct AVOption { · 281 unmodified lines
282	282	int flags;
283	283	#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding
284	284	#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding
	285	+#if FF_API_OPT_TYPE_METADATA
285	286	#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ...
	287	+#endif
286	288	#define AV_OPT_FLAG_AUDIO_PARAM 8
287	289	#define AV_OPT_FLAG_VIDEO_PARAM 16
288	290	#define AV_OPT_FLAG_SUBTITLE_PARAM 32

@@ -57,7 +57,7 @@ · 56 unmodified lines
57	57
58	58	#define LIBAVUTIL_VERSION_MAJOR 52
59	59	#define LIBAVUTIL_VERSION_MINOR 64
60		−#define LIBAVUTIL_VERSION_MICRO 100
	60	+#define LIBAVUTIL_VERSION_MICRO 101
61	61
62	62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
63	63	LIBAVUTIL_VERSION_MINOR, \
@@ -134,6 +134,9 @@ · 70 unmodified lines
134	134	#ifndef FF_API_INTFLOAT
135	135	#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54)
136	136	#endif
	137	+#ifndef FF_API_OPT_TYPE_METADATA
	138	+#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 54)
	139	+#endif
137	140
138	141	/**
139	142	* @}

Keyboard shortcuts