ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/nut.c

 /*
  * nut
  * Copyright (c) 2004-2007 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 51 matching lines @@
     sp->pos= pos;
     sp->back_ptr= back_ptr;
     sp->ts= ts;
     av_tree_insert(&nut->syncpoints, sp, ff_nut_sp_pos_cmp, &node);
     if(node){
         av_free(sp);
         av_free(node);
     }
 }
 
+static void enu_free(void *opaque, void *elem)
+{
+    av_free(elem);
+}
+
+void ff_nut_free_sp(NUTContext *nut)
+{
+    av_tree_enumerate(nut->syncpoints, NULL, NULL, enu_free);
+    av_tree_destroy(nut->syncpoints);
+}
+
 const Dispositions ff_nut_dispositions[] = {
     {"default"     , AV_DISPOSITION_DEFAULT},
     {"dub"         , AV_DISPOSITION_DUB},
     {"original"    , AV_DISPOSITION_ORIGINAL},
     {"comment"     , AV_DISPOSITION_COMMENT},
     {"lyrics"      , AV_DISPOSITION_LYRICS},
     {"karaoke"     , AV_DISPOSITION_KARAOKE},
     {""            , 0}
 };
 
+const AVMetadataConv ff_nut_metadata_conv[] = {
+    { "Author",         "artist"      },
+    { "X-CreationTime", "date"        },
+    { "CreationTime",   "date"        },
+    { "SourceFilename", "filename"    },
+    { "X-Language",     "language"    },
+    { "X-Disposition",  "disposition" },
+    { "X-Replaces",     "replaces"    },
+    { "X-Depends",      "depends"     },
+    { "X-Uses",         "uses"        },
+    { "X-UsesFont",     "usesfont"    },
+    { 0 },
+};