comparison utils.c @ 4626:166d293b44fa libavformat

deprecate old metadata API
author aurel
date Sun, 01 Mar 2009 16:35:25 +0000
parents 3dfd5f8c63ee
children 3176b13b0881
comparison
equal deleted inserted replaced
4625:29c799c20735 4626:166d293b44fa
2299 } 2299 }
2300 av_metadata_free(&st->metadata); 2300 av_metadata_free(&st->metadata);
2301 av_free(st->index_entries); 2301 av_free(st->index_entries);
2302 av_free(st->codec->extradata); 2302 av_free(st->codec->extradata);
2303 av_free(st->codec); 2303 av_free(st->codec);
2304 #if LIBAVFORMAT_VERSION_INT < (53<<16)
2304 av_free(st->filename); 2305 av_free(st->filename);
2306 #endif
2305 av_free(st->priv_data); 2307 av_free(st->priv_data);
2306 av_free(st); 2308 av_free(st);
2307 } 2309 }
2308 for(i=s->nb_programs-1; i>=0; i--) { 2310 for(i=s->nb_programs-1; i>=0; i--) {
2311 #if LIBAVFORMAT_VERSION_INT < (53<<16)
2309 av_freep(&s->programs[i]->provider_name); 2312 av_freep(&s->programs[i]->provider_name);
2310 av_freep(&s->programs[i]->name); 2313 av_freep(&s->programs[i]->name);
2314 #endif
2311 av_metadata_free(&s->programs[i]->metadata); 2315 av_metadata_free(&s->programs[i]->metadata);
2312 av_freep(&s->programs[i]->stream_index); 2316 av_freep(&s->programs[i]->stream_index);
2313 av_freep(&s->programs[i]); 2317 av_freep(&s->programs[i]);
2314 } 2318 }
2315 av_freep(&s->programs); 2319 av_freep(&s->programs);
2316 flush_packet_queue(s); 2320 flush_packet_queue(s);
2317 av_freep(&s->priv_data); 2321 av_freep(&s->priv_data);
2318 while(s->nb_chapters--) { 2322 while(s->nb_chapters--) {
2323 #if LIBAVFORMAT_VERSION_INT < (53<<16)
2319 av_free(s->chapters[s->nb_chapters]->title); 2324 av_free(s->chapters[s->nb_chapters]->title);
2325 #endif
2320 av_metadata_free(&s->chapters[s->nb_chapters]->metadata); 2326 av_metadata_free(&s->chapters[s->nb_chapters]->metadata);
2321 av_free(s->chapters[s->nb_chapters]); 2327 av_free(s->chapters[s->nb_chapters]);
2322 } 2328 }
2323 av_freep(&s->chapters); 2329 av_freep(&s->chapters);
2324 av_metadata_free(&s->metadata); 2330 av_metadata_free(&s->metadata);
2412 chapter= av_mallocz(sizeof(AVChapter)); 2418 chapter= av_mallocz(sizeof(AVChapter));
2413 if(!chapter) 2419 if(!chapter)
2414 return NULL; 2420 return NULL;
2415 dynarray_add(&s->chapters, &s->nb_chapters, chapter); 2421 dynarray_add(&s->chapters, &s->nb_chapters, chapter);
2416 } 2422 }
2423 #if LIBAVFORMAT_VERSION_INT < (53<<16)
2417 av_free(chapter->title); 2424 av_free(chapter->title);
2425 #endif
2418 av_metadata_set(&chapter->metadata, "title", title); 2426 av_metadata_set(&chapter->metadata, "title", title);
2419 chapter->id = id; 2427 chapter->id = id;
2420 chapter->time_base= time_base; 2428 chapter->time_base= time_base;
2421 chapter->start = start; 2429 chapter->start = start;
2422 chapter->end = end; 2430 chapter->end = end;