ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/metadata.c

 /*
  * copyright (c) 2009 Michael Niedermayer
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
@@ skipping 87 matching lines @@
     if(m){
         while(m->count--){
             av_free(m->elems[m->count].key);
             av_free(m->elems[m->count].value);
         }
         av_free(m->elems);
     }
     av_freep(pm);
 }
 
-static void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
                                            const AVMetadataConv *s_conv)
 {
     /* TODO: use binary search to look up the two conversion tables
        if the tables are getting big enough that it would matter speed wise */
     const AVMetadataConv *sc, *dc;
     AVMetadataTag *mtag = NULL;
     AVMetadata *dst = NULL;
     const char *key;
 
     while((mtag=av_metadata_get(*pm, "", mtag, AV_METADATA_IGNORE_SUFFIX))) {
@@ skipping 23 matching lines @@
 {
     int i;
     metadata_conv(&ctx->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_streams ; i++)
         metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_chapters; i++)
         metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_programs; i++)
         metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
 }