ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/nutdec.c

Index: patched-ffmpeg-mt/libavformat/nutdec.c
===================================================================
--- patched-ffmpeg-mt/libavformat/nutdec.c	(revision 41250)
+++ patched-ffmpeg-mt/libavformat/nutdec.c	(working copy)
@@ -389,8 +389,8 @@
 static int decode_info_header(NUTContext *nut){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = s->pb;
-    uint64_t tmp;
-    unsigned int stream_id_plus1, chapter_start, chapter_len, count;
+    uint64_t tmp, chapter_start, chapter_len;
+    unsigned int stream_id_plus1, count;
     int chapter_id, i;
     int64_t value, end;
     char name[256], str_value[1024], type_str[256];
@@ -897,9 +897,13 @@
 static int nut_read_close(AVFormatContext *s)
 {
     NUTContext *nut = s->priv_data;
+    int i;
 
     av_freep(&nut->time_base);
     av_freep(&nut->stream);
+    ff_nut_free_sp(nut);
+    for(i = 1; i < nut->header_count; i++)
+        av_freep(&nut->header[i]);
 
     return 0;
 }
@@ -915,5 +919,6 @@
     nut_read_close,
     read_seek,
     .extensions = "nut",
+    .metadata_conv = ff_nut_metadata_conv,
 };
 #endif