summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-05-23 21:03:14 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-05-23 21:03:14 +0000
commitea4c4d7fe395c6202a83ad36547e58abdfe8263e (patch)
tree7a52d525b6c8ace92992c1c68d6abfc5bc0949b8 /libavformat/avformat.h
parente53ca636d90e4484361dfea7e3017b9697725a00 (diff)
change author metadata to artist in mov de/muxer
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 91d69117f7..a8e4408b82 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -23,7 +23,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 64
-#define LIBAVFORMAT_VERSION_MICRO 0
+#define LIBAVFORMAT_VERSION_MICRO 1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
@@ -169,6 +169,18 @@ void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv,
const AVMetadataConv *s_conv);
/**
+ * Converts metadata set according to the given conversion tables
+ * @param out converted destination metadata
+ * @param in metadata to be converted
+ * @param d_conv destination tags format conversion table
+ * @param s_conv source tags format conversion table
+ */
+void av_metadata_conv_generic(AVMetadata **out,
+ AVMetadata *in,
+ const AVMetadataConv *d_conv,
+ const AVMetadataConv *s_conv);
+
+/**
* Frees all the memory allocated for an AVMetadata struct.
*/
void av_metadata_free(AVMetadata **m);