RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: postpone removal of public metadata conversion API 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2011-02-23 08:01:35 +01:00 committed by Michael Niedermayer
parent 4c262dc140
commit 1f5e9ede23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avformat.h
View File

@ -117,7 +117,7 @@ typedef struct {
}AVMetadataTag;
typedef struct AVMetadata AVMetadata;
#if FF_API_OLD_METADATA
#if FF_API_OLD_METADATA2
typedef struct AVMetadataConv AVMetadataConv;
#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);
#if FF_API_OLD_METADATA
#if FF_API_OLD_METADATA2
/**
* This function is provided for compatibility reason and currently does nothing.
*/

2
libavformat/metadata.c
View File

@ -91,7 +91,9 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
{
return av_metadata_set2(pm, key, value, 0);
}
#endif
#if FF_API_OLD_METADATA2
void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
const AVMetadataConv *s_conv)
{

2
libavformat/metadata.h
View File

@ -39,7 +39,7 @@ struct AVMetadataConv{
const char *native;
const char *generic;
};
#if !FF_API_OLD_METADATA
#if !FF_API_OLD_METADATA2
typedef struct AVMetadataConv AVMetadataConv;
#endif

3
libavformat/version.h
View File

@ -47,6 +47,9 @@
#ifndef FF_API_OLD_METADATA
#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif