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	API changes, most recent first:	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	2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h	21	2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h
19	Add avdevice_list_devices() and avdevice_free_list_devices()	22	Add avdevice_list_devices() and avdevice_free_list_devices()
20		23

     int flags;
 #define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
 #define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#if FF_API_OPT_TYPE_METADATA
 #define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#endif
 #define AV_OPT_FLAG_AUDIO_PARAM     8
 #define AV_OPT_FLAG_VIDEO_PARAM     16
 #define AV_OPT_FLAG_SUBTITLE_PARAM  32

 #define LIBAVUTIL_VERSION_MAJOR  52
 #define LIBAVUTIL_VERSION_MINOR  64
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
 #ifndef FF_API_INTFLOAT
 #define FF_API_INTFLOAT                 (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
+#ifndef FF_API_OPT_TYPE_METADATA
+#define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
 /**
  * @}

Keyboard shortcuts