diff utils.c @ 6387:4974b3d4992b libavformat

rename LAVF_API_* defines to FF_API_* to clarify that it is not public API
author aurel
date Wed, 18 Aug 2010 20:34:31 +0000
parents 2d51ca7714c3
children 054de75e4a49
line wrap: on
line diff
--- a/utils.c	Wed Aug 18 16:29:46 2010 +0000
+++ b/utils.c	Wed Aug 18 20:34:31 2010 +0000
@@ -457,7 +457,7 @@
     if (pb && !ic->data_offset)
         ic->data_offset = url_ftell(ic->pb);
 
-#if LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
     av_free(chapter->title);
 #endif
     av_metadata_set2(&chapter->metadata, "title", title, 0);
@@ -2718,7 +2718,7 @@
             return AVERROR(ENOMEM);
     }
 
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
     ff_metadata_mux_compat(s);
 #endif