X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favienc.c;h=50419960a32fe90e7e5be7a0361ef28366ddc5f0;hb=855e7732c6bcc7d52cd0863407a721c2bf00fcf1;hp=296608704305af282e932bc3a3183ff87415b7bb;hpb=949b1a13bf4434ade235fdcd783c5fe0d27c0c3b;p=ffmpeg

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 29660870430..50419960a32 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -1,6 +1,6 @@
 /*
  * AVI muxer
- * Copyright (c) 2000 Fabrice Bellard.
+ * Copyright (c) 2000 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -21,13 +21,13 @@
 #include "avformat.h"
 #include "avi.h"
 #include "riff.h"
+#include "libavutil/intreadwrite.h"
 
 /*
  * TODO:
  *  - fill all fields if non streamed (nb_frames for example)
  */
 
-#ifdef CONFIG_AVI_MUXER
 typedef struct AVIIentry {
     unsigned int flags, pos, len;
 } AVIIentry;
@@ -35,22 +35,27 @@ typedef struct AVIIentry {
 #define AVI_INDEX_CLUSTER_SIZE 16384
 
 typedef struct AVIIndex {
-    offset_t    indx_start;
+    int64_t     indx_start;
     int         entry;
     int         ents_allocated;
     AVIIentry** cluster;
 } AVIIndex;
 
 typedef struct {
-    offset_t riff_start, movi_list, odml_list;
-    offset_t frames_hdr_all, frames_hdr_strm[MAX_STREAMS];
-    int audio_strm_length[MAX_STREAMS];
+    int64_t riff_start, movi_list, odml_list;
+    int64_t frames_hdr_all;
     int riff_id;
-    int packet_count[MAX_STREAMS];
-
-    AVIIndex indexes[MAX_STREAMS];
 } AVIContext;
 
+typedef struct  {
+    int64_t frames_hdr_strm;
+    int audio_strm_length;
+    int packet_count;
+    int entry;
+
+    AVIIndex indexes;
+} AVIStream ;
+
 static inline AVIIentry* avi_get_ientry(AVIIndex* idx, int ent_id)
 {
     int cl = ent_id / AVI_INDEX_CLUSTER_SIZE;
@@ -58,19 +63,22 @@ static inline AVIIentry* avi_get_ientry(AVIIndex* idx, int ent_id)
     return &idx->cluster[cl][id];
 }
 
-static offset_t avi_start_new_riff(AVIContext *avi, ByteIOContext *pb,
-                                   const char* riff_tag, const char* list_tag)
+static int64_t avi_start_new_riff(AVFormatContext *s, ByteIOContext *pb,
+                                  const char* riff_tag, const char* list_tag)
 {
-    offset_t loff;
+    AVIContext *avi= s->priv_data;
+    int64_t loff;
     int i;
 
     avi->riff_id++;
-    for (i=0; i<MAX_STREAMS; i++)
-         avi->indexes[i].entry = 0;
+    for (i=0; i<s->nb_streams; i++){
+        AVIStream *avist= s->streams[i]->priv_data;
+        avist->indexes.entry = 0;
+    }
 
-    avi->riff_start = start_tag(pb, "RIFF");
+    avi->riff_start = ff_start_tag(pb, "RIFF");
     put_tag(pb, riff_tag);
-    loff = start_tag(pb, "LIST");
+    loff = ff_start_tag(pb, "LIST");
     put_tag(pb, list_tag);
     return loff;
 }
@@ -82,6 +90,10 @@ static char* avi_stream2fourcc(char* tag, int index, enum CodecType type)
     if (type == CODEC_TYPE_VIDEO) {
         tag[2] = 'd';
         tag[3] = 'c';
+    } else if (type == CODEC_TYPE_SUBTITLE) {
+        // note: this is not an official code
+        tag[2] = 's';
+        tag[3] = 'b';
     } else {
         tag[2] = 'w';
         tag[3] = 'b';
@@ -105,25 +117,27 @@ static void avi_write_info_tag(ByteIOContext *pb, const char *tag, const char *s
 
 static int avi_write_counters(AVFormatContext* s, int riff_id)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVIContext *avi = s->priv_data;
     int n, au_byterate, au_ssize, au_scale, nb_frames = 0;
-    offset_t file_size;
+    int64_t file_size;
     AVCodecContext* stream;
 
     file_size = url_ftell(pb);
     for(n = 0; n < s->nb_streams; n++) {
-        assert(avi->frames_hdr_strm[n]);
+        AVIStream *avist= s->streams[n]->priv_data;
+
+        assert(avist->frames_hdr_strm);
         stream = s->streams[n]->codec;
-        url_fseek(pb, avi->frames_hdr_strm[n], SEEK_SET);
+        url_fseek(pb, avist->frames_hdr_strm, SEEK_SET);
         ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale);
         if(au_ssize == 0) {
-            put_le32(pb, avi->packet_count[n]);
+            put_le32(pb, avist->packet_count);
         } else {
-            put_le32(pb, avi->audio_strm_length[n] / au_ssize);
+            put_le32(pb, avist->audio_strm_length / au_ssize);
         }
         if(stream->codec_type == CODEC_TYPE_VIDEO)
-            nb_frames = FFMAX(nb_frames, avi->packet_count[n]);
+            nb_frames = FFMAX(nb_frames, avist->packet_count);
     }
     if(riff_id == 1) {
         assert(avi->frames_hdr_all);
@@ -138,14 +152,21 @@ static int avi_write_counters(AVFormatContext* s, int riff_id)
 static int avi_write_header(AVFormatContext *s)
 {
     AVIContext *avi = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     int bitrate, n, i, nb_frames, au_byterate, au_ssize, au_scale;
     AVCodecContext *stream, *video_enc;
-    offset_t list1, list2, strh, strf;
+    int64_t list1, list2, strh, strf;
+    AVMetadataTag *t = NULL;
+
+    for(n=0;n<s->nb_streams;n++) {
+        s->streams[n]->priv_data= av_mallocz(sizeof(AVIStream));
+        if(!s->streams[n]->priv_data)
+            return AVERROR(ENOMEM);
+    }
 
     /* header list */
     avi->riff_id = 0;
-    list1 = avi_start_new_riff(avi, pb, "AVI ", "hdrl");
+    list1 = avi_start_new_riff(s, pb, "AVI ", "hdrl");
 
     /* avi header */
     put_tag(pb, "avih");
@@ -163,7 +184,7 @@ static int avi_write_header(AVFormatContext *s)
     nb_frames = 0;
 
     if(video_enc){
-        put_le32(pb, (uint32_t)(int64_t_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
+        put_le32(pb, (uint32_t)(INT64_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
     } else {
         put_le32(pb, 0);
     }
@@ -192,25 +213,26 @@ static int avi_write_header(AVFormatContext *s)
 
     /* stream list */
     for(i=0;i<n;i++) {
-        list2 = start_tag(pb, "LIST");
+        AVIStream *avist= s->streams[i]->priv_data;
+        list2 = ff_start_tag(pb, "LIST");
         put_tag(pb, "strl");
 
         stream = s->streams[i]->codec;
 
-        /* FourCC should really be set by the codec itself */
-        if (! stream->codec_tag) {
-            stream->codec_tag = codec_get_bmp_tag(stream->codec_id);
-        }
-
         /* stream generic header */
-        strh = start_tag(pb, "strh");
+        strh = ff_start_tag(pb, "strh");
         switch(stream->codec_type) {
+        case CODEC_TYPE_SUBTITLE:
+            // XSUB subtitles behave like video tracks, other subtitles
+            // are not (yet) supported.
+            if (stream->codec_id != CODEC_ID_XSUB) break;
         case CODEC_TYPE_VIDEO: put_tag(pb, "vids"); break;
         case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break;
 //        case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break;
         case CODEC_TYPE_DATA : put_tag(pb, "dats"); break;
         }
-        if(stream->codec_type == CODEC_TYPE_VIDEO)
+        if(stream->codec_type == CODEC_TYPE_VIDEO ||
+           stream->codec_id == CODEC_ID_XSUB)
             put_le32(pb, stream->codec_tag);
         else
             put_le32(pb, 1);
@@ -226,7 +248,7 @@ static int avi_write_header(AVFormatContext *s)
         av_set_pts_info(s->streams[i], 64, au_scale, au_byterate);
 
         put_le32(pb, 0); /* start */
-        avi->frames_hdr_strm[i] = url_ftell(pb); /* remember this offset to fill later */
+        avist->frames_hdr_strm = url_ftell(pb); /* remember this offset to fill later */
         if (url_is_streamed(pb))
             put_le32(pb, AVI_MAX_RIFF_SIZE); /* FIXME: this may be broken, but who cares */
         else
@@ -244,24 +266,36 @@ static int avi_write_header(AVFormatContext *s)
         put_le32(pb, 0);
         put_le16(pb, stream->width);
         put_le16(pb, stream->height);
-        end_tag(pb, strh);
+        ff_end_tag(pb, strh);
 
       if(stream->codec_type != CODEC_TYPE_DATA){
-        strf = start_tag(pb, "strf");
+        strf = ff_start_tag(pb, "strf");
         switch(stream->codec_type) {
+        case CODEC_TYPE_SUBTITLE:
+            // XSUB subtitles behave like video tracks, other subtitles
+            // are not (yet) supported.
+            if (stream->codec_id != CODEC_ID_XSUB) break;
         case CODEC_TYPE_VIDEO:
-            put_bmp_header(pb, stream, codec_bmp_tags, 0);
+            ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0);
             break;
         case CODEC_TYPE_AUDIO:
-            if (put_wav_header(pb, stream) < 0) {
-                av_free(avi);
+            if (ff_put_wav_header(pb, stream) < 0) {
                 return -1;
             }
             break;
         default:
             return -1;
         }
-        end_tag(pb, strf);
+        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))) {
+            avi_write_info_tag(s->pb, "strn", t->value);
+            t = NULL;
+        }
       }
 
         if (!url_is_streamed(pb)) {
@@ -273,8 +307,8 @@ static int avi_write_header(AVFormatContext *s)
              * like to get away without making AVI an OpenDML one
              * for compatibility reasons.
              */
-            avi->indexes[i].entry = avi->indexes[i].ents_allocated = 0;
-            avi->indexes[i].indx_start = start_tag(pb, "JUNK");
+            avist->indexes.entry = avist->indexes.ents_allocated = 0;
+            avist->indexes.indx_start = ff_start_tag(pb, "JUNK");
             put_le16(pb, 4);        /* wLongsPerEntry */
             put_byte(pb, 0);        /* bIndexSubType (0 == frame index) */
             put_byte(pb, 0);        /* bIndexType (0 == AVI_INDEX_OF_INDEXES) */
@@ -285,49 +319,72 @@ static int avi_write_header(AVFormatContext *s)
             put_le32(pb, 0);           Must be 0.    */
             for (j=0; j < AVI_MASTER_INDEX_SIZE * 2; j++)
                  put_le64(pb, 0);
-            end_tag(pb, avi->indexes[i].indx_start);
+            ff_end_tag(pb, avist->indexes.indx_start);
+        }
+
+        if(   stream->codec_type == CODEC_TYPE_VIDEO
+           && s->streams[i]->sample_aspect_ratio.num>0
+           && s->streams[i]->sample_aspect_ratio.den>0){
+            int vprp= ff_start_tag(pb, "vprp");
+            AVRational dar = av_mul_q(s->streams[i]->sample_aspect_ratio,
+                                      (AVRational){stream->width, stream->height});
+            int num, den;
+            av_reduce(&num, &den, dar.num, dar.den, 0xFFFF);
+
+            put_le32(pb, 0); //video format  = unknown
+            put_le32(pb, 0); //video standard= unknown
+            put_le32(pb, lrintf(1.0/av_q2d(stream->time_base)));
+            put_le32(pb, stream->width );
+            put_le32(pb, stream->height);
+            put_le16(pb, den);
+            put_le16(pb, num);
+            put_le32(pb, stream->width );
+            put_le32(pb, stream->height);
+            put_le32(pb, 1); //progressive FIXME
+
+            put_le32(pb, stream->height);
+            put_le32(pb, stream->width );
+            put_le32(pb, stream->height);
+            put_le32(pb, stream->width );
+            put_le32(pb, 0);
+            put_le32(pb, 0);
+
+            put_le32(pb, 0);
+            put_le32(pb, 0);
+            ff_end_tag(pb, vprp);
         }
 
-        end_tag(pb, list2);
+        ff_end_tag(pb, list2);
     }
 
     if (!url_is_streamed(pb)) {
         /* AVI could become an OpenDML one, if it grows beyond 2Gb range */
-        avi->odml_list = start_tag(pb, "JUNK");
+        avi->odml_list = ff_start_tag(pb, "JUNK");
         put_tag(pb, "odml");
         put_tag(pb, "dmlh");
         put_le32(pb, 248);
         for (i = 0; i < 248; i+= 4)
              put_le32(pb, 0);
-        end_tag(pb, avi->odml_list);
+        ff_end_tag(pb, avi->odml_list);
     }
 
-    end_tag(pb, list1);
+    ff_end_tag(pb, list1);
 
-    list2 = start_tag(pb, "LIST");
+    list2 = ff_start_tag(pb, "LIST");
     put_tag(pb, "INFO");
-    avi_write_info_tag(pb, "INAM", s->title);
-    avi_write_info_tag(pb, "IART", s->author);
-    avi_write_info_tag(pb, "ICOP", s->copyright);
-    avi_write_info_tag(pb, "ICMT", s->comment);
-    avi_write_info_tag(pb, "IPRD", s->album);
-    avi_write_info_tag(pb, "IGNR", s->genre);
-    if (s->track) {
-        char str_track[4];
-        snprintf(str_track, 4, "%d", s->track);
-        avi_write_info_tag(pb, "IPRT", str_track);
+    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);
     }
-    if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
-        avi_write_info_tag(pb, "ISFT", LIBAVFORMAT_IDENT);
-    end_tag(pb, list2);
+    ff_end_tag(pb, list2);
 
     /* some padding for easier tag editing */
-    list2 = start_tag(pb, "JUNK");
+    list2 = ff_start_tag(pb, "JUNK");
     for (i = 0; i < 1016; i += 4)
         put_le32(pb, 0);
-    end_tag(pb, list2);
+    ff_end_tag(pb, list2);
 
-    avi->movi_list = start_tag(pb, "LIST");
+    avi->movi_list = ff_start_tag(pb, "LIST");
     put_tag(pb, "movi");
 
     put_flush_packet(pb);
@@ -337,7 +394,7 @@ static int avi_write_header(AVFormatContext *s)
 
 static int avi_write_ix(AVFormatContext *s)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVIContext *avi = s->priv_data;
     char tag[5];
     char ix_tag[] = "ix00";
@@ -349,7 +406,8 @@ static int avi_write_ix(AVFormatContext *s)
         return -1;
 
     for (i=0;i<s->nb_streams;i++) {
-         offset_t ix, pos;
+        AVIStream *avist= s->streams[i]->priv_data;
+         int64_t ix, pos;
 
          avi_stream2fourcc(&tag[0], i, s->streams[i]->codec->codec_type);
          ix_tag[3] = '0' + i;
@@ -357,19 +415,19 @@ static int avi_write_ix(AVFormatContext *s)
          /* Writing AVI OpenDML leaf index chunk */
          ix = url_ftell(pb);
          put_tag(pb, &ix_tag[0]);     /* ix?? */
-         put_le32(pb, avi->indexes[i].entry * 8 + 24);
+         put_le32(pb, avist->indexes.entry * 8 + 24);
                                       /* chunk size */
          put_le16(pb, 2);             /* wLongsPerEntry */
          put_byte(pb, 0);             /* bIndexSubType (0 == frame index) */
          put_byte(pb, 1);             /* bIndexType (1 == AVI_INDEX_OF_CHUNKS) */
-         put_le32(pb, avi->indexes[i].entry);
+         put_le32(pb, avist->indexes.entry);
                                       /* nEntriesInUse */
          put_tag(pb, &tag[0]);        /* dwChunkId */
          put_le64(pb, avi->movi_list);/* qwBaseOffset */
          put_le32(pb, 0);             /* dwReserved_3 (must be 0) */
 
-         for (j=0; j<avi->indexes[i].entry; j++) {
-             AVIIentry* ie = avi_get_ientry(&avi->indexes[i], j);
+         for (j=0; j<avist->indexes.entry; j++) {
+             AVIIentry* ie = avi_get_ientry(&avist->indexes, j);
              put_le32(pb, ie->pos + 8);
              put_le32(pb, ((uint32_t)ie->len & ~0x80000000) |
                           (ie->flags & 0x10 ? 0 : 0x80000000));
@@ -378,14 +436,14 @@ static int avi_write_ix(AVFormatContext *s)
          pos = url_ftell(pb);
 
          /* Updating one entry in the AVI OpenDML master index */
-         url_fseek(pb, avi->indexes[i].indx_start - 8, SEEK_SET);
+         url_fseek(pb, avist->indexes.indx_start - 8, SEEK_SET);
          put_tag(pb, "indx");                 /* enabling this entry */
          url_fskip(pb, 8);
          put_le32(pb, avi->riff_id);          /* nEntriesInUse */
          url_fskip(pb, 16*avi->riff_id);
          put_le64(pb, ix);                    /* qwOffset */
          put_le32(pb, pos - ix);              /* dwSize */
-         put_le32(pb, avi->indexes[i].entry); /* dwDuration */
+         put_le32(pb, avist->indexes.entry); /* dwDuration */
 
          url_fseek(pb, pos, SEEK_SET);
     }
@@ -394,26 +452,31 @@ static int avi_write_ix(AVFormatContext *s)
 
 static int avi_write_idx1(AVFormatContext *s)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVIContext *avi = s->priv_data;
-    offset_t idx_chunk;
+    int64_t idx_chunk;
     int i;
     char tag[5];
 
     if (!url_is_streamed(pb)) {
+        AVIStream *avist;
         AVIIentry* ie = 0, *tie;
-        int entry[MAX_STREAMS];
         int empty, stream_id = -1;
 
-        idx_chunk = start_tag(pb, "idx1");
-        memset(&entry[0], 0, sizeof(entry));
+        idx_chunk = ff_start_tag(pb, "idx1");
+        for(i=0; i<s->nb_streams; i++){
+            avist= s->streams[i]->priv_data;
+            avist->entry=0;
+        }
+
         do {
             empty = 1;
             for (i=0; i<s->nb_streams; i++) {
-                 if (avi->indexes[i].entry <= entry[i])
+                avist= s->streams[i]->priv_data;
+                 if (avist->indexes.entry <= avist->entry)
                      continue;
 
-                 tie = avi_get_ientry(&avi->indexes[i], entry[i]);
+                 tie = avi_get_ientry(&avist->indexes, avist->entry);
                  if (empty || tie->pos < ie->pos) {
                      ie = tie;
                      stream_id = i;
@@ -421,16 +484,17 @@ static int avi_write_idx1(AVFormatContext *s)
                  empty = 0;
             }
             if (!empty) {
+                avist= s->streams[stream_id]->priv_data;
                 avi_stream2fourcc(&tag[0], stream_id,
                                   s->streams[stream_id]->codec->codec_type);
                 put_tag(pb, &tag[0]);
                 put_le32(pb, ie->flags);
                 put_le32(pb, ie->pos);
                 put_le32(pb, ie->len);
-                entry[stream_id]++;
+                avist->entry++;
             }
         } while (!empty);
-        end_tag(pb, idx_chunk);
+        ff_end_tag(pb, idx_chunk);
 
         avi_write_counters(s, avi->riff_id);
     }
@@ -440,15 +504,16 @@ static int avi_write_idx1(AVFormatContext *s)
 static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     AVIContext *avi = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned char tag[5];
     unsigned int flags=0;
     const int stream_index= pkt->stream_index;
+    AVIStream *avist= s->streams[stream_index]->priv_data;
     AVCodecContext *enc= s->streams[stream_index]->codec;
     int size= pkt->size;
 
 //    av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %d\n", pkt->dts, avi->packet_count[stream_index], stream_index);
-    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avi->packet_count[stream_index]){
+    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count){
         AVPacket empty_packet;
 
         av_init_packet(&empty_packet);
@@ -458,31 +523,31 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
         avi_write_packet(s, &empty_packet);
 //        av_log(s, AV_LOG_DEBUG, "dup %"PRId64" %d\n", pkt->dts, avi->packet_count[stream_index]);
     }
-    avi->packet_count[stream_index]++;
+    avist->packet_count++;
 
     // Make sure to put an OpenDML chunk when the file size exceeds the limits
     if (!url_is_streamed(pb) &&
         (url_ftell(pb) - avi->riff_start > AVI_MAX_RIFF_SIZE)) {
 
         avi_write_ix(s);
-        end_tag(pb, avi->movi_list);
+        ff_end_tag(pb, avi->movi_list);
 
         if (avi->riff_id == 1)
             avi_write_idx1(s);
 
-        end_tag(pb, avi->riff_start);
-        avi->movi_list = avi_start_new_riff(avi, pb, "AVIX", "movi");
+        ff_end_tag(pb, avi->riff_start);
+        avi->movi_list = avi_start_new_riff(s, pb, "AVIX", "movi");
     }
 
     avi_stream2fourcc(&tag[0], stream_index, enc->codec_type);
     if(pkt->flags&PKT_FLAG_KEY)
         flags = 0x10;
     if (enc->codec_type == CODEC_TYPE_AUDIO) {
-       avi->audio_strm_length[stream_index] += size;
+       avist->audio_strm_length += size;
     }
 
-    if (!url_is_streamed(&s->pb)) {
-        AVIIndex* idx = &avi->indexes[stream_index];
+    if (!url_is_streamed(s->pb)) {
+        AVIIndex* idx = &avist->indexes;
         int cl = idx->entry / AVI_INDEX_CLUSTER_SIZE;
         int id = idx->entry % AVI_INDEX_CLUSTER_SIZE;
         if (idx->ents_allocated <= idx->entry) {
@@ -514,52 +579,53 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
 static int avi_write_trailer(AVFormatContext *s)
 {
     AVIContext *avi = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     int res = 0;
     int i, j, n, nb_frames;
-    offset_t file_size;
-
-    if (!url_is_streamed(pb))
-    {
-    if (avi->riff_id == 1) {
-        end_tag(pb, avi->movi_list);
-        res = avi_write_idx1(s);
-        end_tag(pb, avi->riff_start);
-    } else {
-        avi_write_ix(s);
-        end_tag(pb, avi->movi_list);
-        end_tag(pb, avi->riff_start);
-
-        file_size = url_ftell(pb);
-        url_fseek(pb, avi->odml_list - 8, SEEK_SET);
-        put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
-        url_fskip(pb, 16);
-
-        for (n=nb_frames=0;n<s->nb_streams;n++) {
-             AVCodecContext *stream = s->streams[n]->codec;
-             if (stream->codec_type == CODEC_TYPE_VIDEO) {
-                 if (nb_frames < avi->packet_count[n])
-                     nb_frames = avi->packet_count[n];
-             } else {
-                 if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
-                     nb_frames += avi->packet_count[n];
+    int64_t file_size;
+
+    if (!url_is_streamed(pb)){
+        if (avi->riff_id == 1) {
+            ff_end_tag(pb, avi->movi_list);
+            res = avi_write_idx1(s);
+            ff_end_tag(pb, avi->riff_start);
+        } else {
+            avi_write_ix(s);
+            ff_end_tag(pb, avi->movi_list);
+            ff_end_tag(pb, avi->riff_start);
+
+            file_size = url_ftell(pb);
+            url_fseek(pb, avi->odml_list - 8, SEEK_SET);
+            put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
+            url_fskip(pb, 16);
+
+            for (n=nb_frames=0;n<s->nb_streams;n++) {
+                AVCodecContext *stream = s->streams[n]->codec;
+                AVIStream *avist= s->streams[n]->priv_data;
+
+                if (stream->codec_type == CODEC_TYPE_VIDEO) {
+                    if (nb_frames < avist->packet_count)
+                        nb_frames = avist->packet_count;
+                } else {
+                    if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
+                        nb_frames += avist->packet_count;
+                    }
                 }
             }
-        }
-        put_le32(pb, nb_frames);
-        url_fseek(pb, file_size, SEEK_SET);
+            put_le32(pb, nb_frames);
+            url_fseek(pb, file_size, SEEK_SET);
 
-        avi_write_counters(s, avi->riff_id);
-    }
+            avi_write_counters(s, avi->riff_id);
+        }
     }
     put_flush_packet(pb);
 
-    for (i=0; i<MAX_STREAMS; i++) {
-         for (j=0; j<avi->indexes[i].ents_allocated/AVI_INDEX_CLUSTER_SIZE; j++)
-              av_free(avi->indexes[i].cluster[j]);
-         av_free(avi->indexes[i].cluster);
-         avi->indexes[i].cluster = NULL;
-         avi->indexes[i].ents_allocated = avi->indexes[i].entry = 0;
+    for (i=0; i<s->nb_streams; i++) {
+         AVIStream *avist= s->streams[i]->priv_data;
+         for (j=0; j<avist->indexes.ents_allocated/AVI_INDEX_CLUSTER_SIZE; j++)
+              av_free(avist->indexes.cluster[j]);
+         av_freep(&avist->indexes.cluster);
+         avist->indexes.ents_allocated = avist->indexes.entry = 0;
     }
 
     return res;
@@ -567,7 +633,7 @@ static int avi_write_trailer(AVFormatContext *s)
 
 AVOutputFormat avi_muxer = {
     "avi",
-    "avi format",
+    NULL_IF_CONFIG_SMALL("AVI format"),
     "video/x-msvideo",
     "avi",
     sizeof(AVIContext),
@@ -576,5 +642,7 @@ AVOutputFormat avi_muxer = {
     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,
 };
-#endif //CONFIG_AVI_MUXER