Revision 03700d39 libavformat/avformat.h

View differences:

libavformat/avformat.h
22 22
#define AVFORMAT_AVFORMAT_H
23 23

  
24 24
#define LIBAVFORMAT_VERSION_MAJOR 52
25
#define LIBAVFORMAT_VERSION_MINOR 82
25
#define LIBAVFORMAT_VERSION_MINOR 83
26 26
#define LIBAVFORMAT_VERSION_MICRO  0
27 27

  
28 28
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
......
137 137
 *       sorting will have '-sort' appended. E.g. artist="The Beatles",
138 138
 *       artist-sort="Beatles, The".
139 139
 *
140
 * 4. Tag names are normally exported exactly as stored in the container to
141
 *    allow lossless remuxing to the same format. For container-independent
142
 *    handling of metadata, av_metadata_conv() can convert it to ffmpeg generic
143
 *    format. Follows a list of generic tag names:
140
 * 4. Demuxers attempt to export metadata in a generic format, however tags
141
 *    with no generic equivalents are left as they are stored in the container.
142
 *    Follows a list of generic tag names:
144 143
 *
145 144
 * album        -- name of the set this work belongs to
146 145
 * album_artist -- main creator of the set/album, if different from artist.
......
177 176
}AVMetadataTag;
178 177

  
179 178
typedef struct AVMetadata AVMetadata;
179
#if FF_API_OLD_METADATA
180 180
typedef struct AVMetadataConv AVMetadataConv;
181
#endif
181 182

  
182 183
/**
183 184
 * Get a metadata element with matching key.
......
216 217
 */
217 218
int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
218 219

  
220
#if FF_API_OLD_METADATA
219 221
/**
220
 * Convert all the metadata sets from ctx according to the source and
221
 * destination conversion tables. If one of the tables is NULL, then
222
 * tags are converted to/from ffmpeg generic tag names.
223
 *
224
 * @param d_conv destination tags format conversion table
225
 * @param s_conv source tags format conversion table
222
 * This function is provided for compatibility reason and currently does nothing.
226 223
 */
227
void av_metadata_conv(struct AVFormatContext *ctx, const AVMetadataConv *d_conv,
228
                                                   const AVMetadataConv *s_conv);
224
attribute_deprecated void av_metadata_conv(struct AVFormatContext *ctx, const AVMetadataConv *d_conv,
225
                                                                        const AVMetadataConv *s_conv);
226
#endif
229 227

  
230 228
/**
231 229
 * Free all the memory allocated for an AVMetadata struct.
......
349 347

  
350 348
    enum CodecID subtitle_codec; /**< default subtitle codec */
351 349

  
350
#if FF_API_OLD_METADATA
352 351
    const AVMetadataConv *metadata_conv;
352
#endif
353 353

  
354 354
    /* private fields */
355 355
    struct AVOutputFormat *next;
......
465 465
     */
466 466
    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
467 467

  
468
#if FF_API_OLD_METADATA
468 469
    const AVMetadataConv *metadata_conv;
470
#endif
469 471

  
470 472
    /* private fields */
471 473
    struct AVInputFormat *next;

Also available in: Unified diff