summaryrefslogtreecommitdiff
path: root/libavformat/metadata.h
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-10-15 19:04:25 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-15 19:04:25 +0000
commit03700d399bcc749ad7916f2d39a99527f37c8b6e (patch)
tree20d22335ebef2e37679f6e3c71d1e264c1e38fe5 /libavformat/metadata.h
parented09233fa2b081e3f60c02267fe9d17e0bb45396 (diff)
Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/metadata.h')
-rw-r--r--libavformat/metadata.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 3706bc409d..197ca515e6 100644
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -39,6 +39,9 @@ struct AVMetadataConv{
const char *native;
const char *generic;
};
+#if !FF_API_OLD_METADATA
+typedef struct AVMetadataConv AVMetadataConv;
+#endif
#if FF_API_OLD_METADATA
void ff_metadata_demux_compat(AVFormatContext *s);
@@ -47,5 +50,7 @@ void ff_metadata_mux_compat(AVFormatContext *s);
void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
const AVMetadataConv *s_conv);
+void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+ const AVMetadataConv *s_conv);
#endif /* AVFORMAT_METADATA_H */