Mercurial > libavformat.hg
diff utils.c @ 6384:2d51ca7714c3 libavformat
add LAVF_API_OLD_METADATA define to disable the deprecated metadata API
author | aurel |
---|---|
date | Tue, 17 Aug 2010 20:23:19 +0000 |
parents | 8b5aedaf23b2 |
children | 4974b3d4992b |
line wrap: on
line diff
--- a/utils.c Tue Aug 17 19:30:21 2010 +0000 +++ b/utils.c Tue Aug 17 20:23:19 2010 +0000 @@ -457,7 +457,7 @@ if (pb && !ic->data_offset) ic->data_offset = url_ftell(ic->pb); -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if LAVF_API_OLD_METADATA ff_metadata_demux_compat(ic); #endif @@ -2460,14 +2460,14 @@ av_free(st->index_entries); av_free(st->codec->extradata); av_free(st->codec); -#if LIBAVFORMAT_VERSION_INT < (53<<16) +#if LAVF_API_OLD_METADATA av_free(st->filename); #endif av_free(st->priv_data); av_free(st); } for(i=s->nb_programs-1; i>=0; i--) { -#if LIBAVFORMAT_VERSION_INT < (53<<16) +#if LAVF_API_OLD_METADATA av_freep(&s->programs[i]->provider_name); av_freep(&s->programs[i]->name); #endif @@ -2479,7 +2479,7 @@ flush_packet_queue(s); av_freep(&s->priv_data); while(s->nb_chapters--) { -#if LIBAVFORMAT_VERSION_INT < (53<<16) +#if LAVF_API_OLD_METADATA av_free(s->chapters[s->nb_chapters]->title); #endif av_metadata_free(&s->chapters[s->nb_chapters]->metadata); @@ -2582,7 +2582,7 @@ return NULL; dynarray_add(&s->chapters, &s->nb_chapters, chapter); } -#if LIBAVFORMAT_VERSION_INT < (53<<16) +#if LAVF_API_OLD_METADATA av_free(chapter->title); #endif av_metadata_set2(&chapter->metadata, "title", title, 0); @@ -2718,7 +2718,7 @@ return AVERROR(ENOMEM); } -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if LAVF_API_OLD_METADATA ff_metadata_mux_compat(s); #endif