Commit 451d566f authored by Anton Khirnov's avatar Anton Khirnov

lavf: postpone removal of public metadata conversion API

It's been deprecated only a few months ago, long after 0.6.
parent c7767327
...@@ -118,7 +118,7 @@ typedef struct { ...@@ -118,7 +118,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
...@@ -159,7 +159,7 @@ attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const ...@@ -159,7 +159,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.
*/ */
...@@ -317,7 +317,7 @@ typedef struct AVOutputFormat { ...@@ -317,7 +317,7 @@ typedef struct AVOutputFormat {
enum CodecID subtitle_codec; /**< default subtitle codec */ enum CodecID subtitle_codec; /**< default subtitle codec */
#if FF_API_OLD_METADATA #if FF_API_OLD_METADATA2
const AVMetadataConv *metadata_conv; const AVMetadataConv *metadata_conv;
#endif #endif
...@@ -437,7 +437,7 @@ typedef struct AVInputFormat { ...@@ -437,7 +437,7 @@ typedef struct AVInputFormat {
*/ */
int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
#if FF_API_OLD_METADATA #if FF_API_OLD_METADATA2
const AVMetadataConv *metadata_conv; const AVMetadataConv *metadata_conv;
#endif #endif
......
...@@ -91,7 +91,9 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value) ...@@ -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{ ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment