patched ffmpeg nov 2

source/patched-ffmpeg-mt/libavformat/avienc.c

 /*
  * AVI muxer
  * Copyright (c) 2000 Fabrice Bellard
  *
  * 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 272 matching lines @@
             break;
         case AVMEDIA_TYPE_AUDIO:
             if (ff_put_wav_header(pb, stream) < 0) {
                 return -1;
             }
             break;
         default:
             return -1;
         }
         ff_end_tag(pb, strf);
-        if ((t = av_metadata_get(s->streams[i]->metadata, "strn", NULL, 0))) {
-            avi_write_info_tag(s->pb, t->key, t->value);
-            t = NULL;
-        }
-        //FIXME a limitation of metadata conversion system
-        else if ((t = av_metadata_get(s->streams[i]->metadata, "INAM", NULL, 0))) {
+        if ((t = av_metadata_get(s->streams[i]->metadata, "title", NULL, 0))) {
             avi_write_info_tag(s->pb, "strn", t->value);
             t = NULL;
         }
       }
 
         if (!url_is_streamed(pb)) {
             unsigned char tag[5];
             int j;
 
             /* Starting to lay out AVI OpenDML master index.
@@ skipping 59 matching lines @@
         put_le32(pb, 248);
         for (i = 0; i < 248; i+= 4)
              put_le32(pb, 0);
         ff_end_tag(pb, avi->odml_list);
     }
 
     ff_end_tag(pb, list1);
 
     list2 = ff_start_tag(pb, "LIST");
     put_tag(pb, "INFO");
+    ff_metadata_conv(&s->metadata, ff_avi_metadata_conv, NULL);
     for (i = 0; *ff_avi_tags[i]; i++) {
         if ((t = av_metadata_get(s->metadata, ff_avi_tags[i], NULL, AV_METADATA_MATCH_CASE)))
             avi_write_info_tag(s->pb, t->key, t->value);
     }
     ff_end_tag(pb, list2);
 
     /* some padding for easier tag editing */
     list2 = ff_start_tag(pb, "JUNK");
     for (i = 0; i < 1016; i += 4)
         put_le32(pb, 0);
@@ skipping 252 matching lines @@
     "video/x-msvideo",
     "avi",
     sizeof(AVIContext),
     CODEC_ID_MP2,
     CODEC_ID_MPEG4,
     avi_write_header,
     avi_write_packet,
     avi_write_trailer,
     .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
     .flags= AVFMT_VARIABLE_FPS,
-    .metadata_conv = ff_avi_metadata_conv,
 };