Mercurial > libavformat.hg

comparison utils.c @ 6387:4974b3d4992b libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6386:dd54b36d1b8c 6387:4974b3d4992b
455 } 455 }
456 456
457 if (pb && !ic->data_offset) 457 if (pb && !ic->data_offset)
458 ic->data_offset = url_ftell(ic->pb); 458 ic->data_offset = url_ftell(ic->pb);
459 459
460 #if LAVF_API_OLD_METADATA 460 #if FF_API_OLD_METADATA
461 ff_metadata_demux_compat(ic); 461 ff_metadata_demux_compat(ic);
462 #endif 462 #endif
463 463
464 ic->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; 464 ic->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE;
465 465
2458 } 2458 }
2459 av_metadata_free(&st->metadata); 2459 av_metadata_free(&st->metadata);
2460 av_free(st->index_entries); 2460 av_free(st->index_entries);
2461 av_free(st->codec->extradata); 2461 av_free(st->codec->extradata);
2462 av_free(st->codec); 2462 av_free(st->codec);
2463 #if LAVF_API_OLD_METADATA 2463 #if FF_API_OLD_METADATA
2464 av_free(st->filename); 2464 av_free(st->filename);
2465 #endif 2465 #endif
2466 av_free(st->priv_data); 2466 av_free(st->priv_data);
2467 av_free(st); 2467 av_free(st);
2468 } 2468 }
2469 for(i=s->nb_programs-1; i>=0; i--) { 2469 for(i=s->nb_programs-1; i>=0; i--) {
2470 #if LAVF_API_OLD_METADATA 2470 #if FF_API_OLD_METADATA
2471 av_freep(&s->programs[i]->provider_name); 2471 av_freep(&s->programs[i]->provider_name);
2472 av_freep(&s->programs[i]->name); 2472 av_freep(&s->programs[i]->name);
2473 #endif 2473 #endif
2474 av_metadata_free(&s->programs[i]->metadata); 2474 av_metadata_free(&s->programs[i]->metadata);
2475 av_freep(&s->programs[i]->stream_index); 2475 av_freep(&s->programs[i]->stream_index);
2477 } 2477 }
2478 av_freep(&s->programs); 2478 av_freep(&s->programs);
2479 flush_packet_queue(s); 2479 flush_packet_queue(s);
2480 av_freep(&s->priv_data); 2480 av_freep(&s->priv_data);
2481 while(s->nb_chapters--) { 2481 while(s->nb_chapters--) {
2482 #if LAVF_API_OLD_METADATA 2482 #if FF_API_OLD_METADATA
2483 av_free(s->chapters[s->nb_chapters]->title); 2483 av_free(s->chapters[s->nb_chapters]->title);
2484 #endif 2484 #endif
2485 av_metadata_free(&s->chapters[s->nb_chapters]->metadata); 2485 av_metadata_free(&s->chapters[s->nb_chapters]->metadata);
2486 av_free(s->chapters[s->nb_chapters]); 2486 av_free(s->chapters[s->nb_chapters]);
2487 } 2487 }
2580 chapter= av_mallocz(sizeof(AVChapter)); 2580 chapter= av_mallocz(sizeof(AVChapter));
2581 if(!chapter) 2581 if(!chapter)
2582 return NULL; 2582 return NULL;
2583 dynarray_add(&s->chapters, &s->nb_chapters, chapter); 2583 dynarray_add(&s->chapters, &s->nb_chapters, chapter);
2584 } 2584 }
2585 #if LAVF_API_OLD_METADATA 2585 #if FF_API_OLD_METADATA
2586 av_free(chapter->title); 2586 av_free(chapter->title);
2587 #endif 2587 #endif
2588 av_metadata_set2(&chapter->metadata, "title", title, 0); 2588 av_metadata_set2(&chapter->metadata, "title", title, 0);
2589 chapter->id = id; 2589 chapter->id = id;
2590 chapter->time_base= time_base; 2590 chapter->time_base= time_base;
2716 s->priv_data = av_mallocz(s->oformat->priv_data_size); 2716 s->priv_data = av_mallocz(s->oformat->priv_data_size);
2717 if (!s->priv_data) 2717 if (!s->priv_data)
2718 return AVERROR(ENOMEM); 2718 return AVERROR(ENOMEM);
2719 } 2719 }
2720 2720
2721 #if LAVF_API_OLD_METADATA 2721 #if FF_API_OLD_METADATA
2722 ff_metadata_mux_compat(s); 2722 ff_metadata_mux_compat(s);
2723 #endif 2723 #endif
2724 2724
2725 /* set muxer identification string */ 2725 /* set muxer identification string */
2726 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { 2726 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {