diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-17 20:23:19 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-17 20:23:19 +0000 |
| commit | dd872bf49f0ef1226c4a1e99e908a5213a59b32f (patch) | |
| tree | 75fb4c07df1f243c97af4af9bbc96ddd0e8f0c3e /libavformat/utils.c | |
| parent | 072e3efd1b0ca3c5d08fa2119e88fb36b5708592 (diff) | |
| download | ffmpeg-dd872bf49f0ef1226c4a1e99e908a5213a59b32f.tar.gz | |
add LAVF_API_OLD_METADATA define to disable the deprecated metadata API
Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 8853a650cb..c63e585b64 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -457,7 +457,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, 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 @@ 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) +#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 @@ 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) +#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 @@ 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) +#if LAVF_API_OLD_METADATA av_free(chapter->title); #endif av_metadata_set2(&chapter->metadata, "title", title, 0); @@ -2718,7 +2718,7 @@ int av_write_header(AVFormatContext *s) return AVERROR(ENOMEM); } -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if LAVF_API_OLD_METADATA ff_metadata_mux_compat(s); #endif |