diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-03-01 16:35:25 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-03-01 16:35:25 +0000 |
commit | 827f7e285ba1d0090f8c39770a5669373a132fad (patch) | |
tree | 63d195a97174f80a9f5336a4209a04e0386d776c /libavformat/utils.c | |
parent | bc718b4720fbde0eda767ec3fdf34cb216261291 (diff) | |
download | ffmpeg-827f7e285ba1d0090f8c39770a5669373a132fad.tar.gz |
deprecate old metadata API
Originally committed as revision 17690 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 24817b5655..900bd206e1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2301,13 +2301,17 @@ void av_close_input_stream(AVFormatContext *s) av_free(st->index_entries); av_free(st->codec->extradata); av_free(st->codec); +#if LIBAVFORMAT_VERSION_INT < (53<<16) 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) av_freep(&s->programs[i]->provider_name); av_freep(&s->programs[i]->name); +#endif av_metadata_free(&s->programs[i]->metadata); av_freep(&s->programs[i]->stream_index); av_freep(&s->programs[i]); @@ -2316,7 +2320,9 @@ void av_close_input_stream(AVFormatContext *s) flush_packet_queue(s); av_freep(&s->priv_data); while(s->nb_chapters--) { +#if LIBAVFORMAT_VERSION_INT < (53<<16) av_free(s->chapters[s->nb_chapters]->title); +#endif av_metadata_free(&s->chapters[s->nb_chapters]->metadata); av_free(s->chapters[s->nb_chapters]); } @@ -2414,7 +2420,9 @@ AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int6 return NULL; dynarray_add(&s->chapters, &s->nb_chapters, chapter); } +#if LIBAVFORMAT_VERSION_INT < (53<<16) av_free(chapter->title); +#endif av_metadata_set(&chapter->metadata, "title", title); chapter->id = id; chapter->time_base= time_base; |