Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'

[ffmpeg] / libavformat / flvenc.c

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 7fad21cc1315de59b1dad2037bf549f8a02a6bd8..dd74d4c4dac8c68ece33337fc924511d62339fec 100644 (file)
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -304,7 +304,7 @@ static int flv_write_header(AVFormatContext *s)
     /* mixed array (hash) with size and string/type/data tuples */
     avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
     metadata_count_pos = avio_tell(pb);
-    metadata_count = 5 * !!video_enc +
+    metadata_count = 4 * !!video_enc +
                      5 * !!audio_enc +
                      1 * !!data_enc  +
                      2; // +2 for duration and file size
@@ -330,6 +330,7 @@ static int flv_write_header(AVFormatContext *s)
         if (framerate != 0.0) {
             put_amf_string(pb, "framerate");
             put_amf_double(pb, framerate);
+            metadata_count++;
         }
 
         put_amf_string(pb, "videocodecid");