Revision 451d566f
libavformat/avformat.h | ||
---|---|---|
118 | 118 |
}AVMetadataTag; |
119 | 119 |
|
120 | 120 |
typedef struct AVMetadata AVMetadata; |
121 |
#if FF_API_OLD_METADATA |
|
121 |
#if FF_API_OLD_METADATA2
|
|
122 | 122 |
typedef struct AVMetadataConv AVMetadataConv; |
123 | 123 |
#endif |
124 | 124 |
|
... | ... | |
159 | 159 |
*/ |
160 | 160 |
int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags); |
161 | 161 |
|
162 |
#if FF_API_OLD_METADATA |
|
162 |
#if FF_API_OLD_METADATA2
|
|
163 | 163 |
/** |
164 | 164 |
* This function is provided for compatibility reason and currently does nothing. |
165 | 165 |
*/ |
... | ... | |
317 | 317 |
|
318 | 318 |
enum CodecID subtitle_codec; /**< default subtitle codec */ |
319 | 319 |
|
320 |
#if FF_API_OLD_METADATA |
|
320 |
#if FF_API_OLD_METADATA2
|
|
321 | 321 |
const AVMetadataConv *metadata_conv; |
322 | 322 |
#endif |
323 | 323 |
|
... | ... | |
437 | 437 |
*/ |
438 | 438 |
int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); |
439 | 439 |
|
440 |
#if FF_API_OLD_METADATA |
|
440 |
#if FF_API_OLD_METADATA2
|
|
441 | 441 |
const AVMetadataConv *metadata_conv; |
442 | 442 |
#endif |
443 | 443 |
|
libavformat/metadata.c | ||
---|---|---|
91 | 91 |
{ |
92 | 92 |
return av_metadata_set2(pm, key, value, 0); |
93 | 93 |
} |
94 |
#endif |
|
94 | 95 |
|
96 |
#if FF_API_OLD_METADATA2 |
|
95 | 97 |
void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv, |
96 | 98 |
const AVMetadataConv *s_conv) |
97 | 99 |
{ |
libavformat/metadata.h | ||
---|---|---|
39 | 39 |
const char *native; |
40 | 40 |
const char *generic; |
41 | 41 |
}; |
42 |
#if !FF_API_OLD_METADATA |
|
42 |
#if !FF_API_OLD_METADATA2
|
|
43 | 43 |
typedef struct AVMetadataConv AVMetadataConv; |
44 | 44 |
#endif |
45 | 45 |
|
libavformat/version.h | ||
---|---|---|
47 | 47 |
#ifndef FF_API_OLD_METADATA |
48 | 48 |
#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) |
49 | 49 |
#endif |
50 |
#ifndef FF_API_OLD_METADATA2 |
|
51 |
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54) |
|
52 |
#endif |
|
50 | 53 |
#ifndef FF_API_URL_CLASS |
51 | 54 |
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) |
52 | 55 |
#endif |
Also available in: Unified diff