mirror of https://git.ffmpeg.org/ffmpeg.git
lavf: postpone removal of public metadata conversion API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
4c262dc140
commit
1f5e9ede23
|
@ -117,7 +117,7 @@ typedef struct {
|
||||||
}AVMetadataTag;
|
}AVMetadataTag;
|
||||||
|
|
||||||
typedef struct AVMetadata AVMetadata;
|
typedef struct AVMetadata AVMetadata;
|
||||||
#if FF_API_OLD_METADATA
|
#if FF_API_OLD_METADATA2
|
||||||
typedef struct AVMetadataConv AVMetadataConv;
|
typedef struct AVMetadataConv AVMetadataConv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@ attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const
|
||||||
*/
|
*/
|
||||||
int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
|
int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
|
||||||
|
|
||||||
#if FF_API_OLD_METADATA
|
#if FF_API_OLD_METADATA2
|
||||||
/**
|
/**
|
||||||
* This function is provided for compatibility reason and currently does nothing.
|
* This function is provided for compatibility reason and currently does nothing.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -91,7 +91,9 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
|
||||||
{
|
{
|
||||||
return av_metadata_set2(pm, key, value, 0);
|
return av_metadata_set2(pm, key, value, 0);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if FF_API_OLD_METADATA2
|
||||||
void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
||||||
const AVMetadataConv *s_conv)
|
const AVMetadataConv *s_conv)
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,7 +39,7 @@ struct AVMetadataConv{
|
||||||
const char *native;
|
const char *native;
|
||||||
const char *generic;
|
const char *generic;
|
||||||
};
|
};
|
||||||
#if !FF_API_OLD_METADATA
|
#if !FF_API_OLD_METADATA2
|
||||||
typedef struct AVMetadataConv AVMetadataConv;
|
typedef struct AVMetadataConv AVMetadataConv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,9 @@
|
||||||
#ifndef FF_API_OLD_METADATA
|
#ifndef FF_API_OLD_METADATA
|
||||||
#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
|
#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef FF_API_OLD_METADATA2
|
||||||
|
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
|
||||||
|
#endif
|
||||||
#ifndef FF_API_URL_CLASS
|
#ifndef FF_API_URL_CLASS
|
||||||
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
|
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue