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
This commit is contained in:
Anton Khirnov
2010-10-15 19:04:25 +00:00
committed by Aurelien Jacobs
parent ed09233fa2
commit 03700d399b
21 changed files with 55 additions and 39 deletions

View File

@@ -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 */