Fix onMetaData property count in flv files (issue 1206).

Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 63accbb..3ca1874 100644 (file)
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -200,7 +200,7 @@ static int flv_write_header(AVFormatContext *s)
 
     /* mixed array (hash) with size and string/type/data tuples */
     put_byte(pb, AMF_DATA_TYPE_MIXEDARRAY);
-    put_be32(pb, 5*!!video_enc + 4*!!audio_enc + 2); // +2 for duration and file size
+    put_be32(pb, 5*!!video_enc + 5*!!audio_enc + 2); // +2 for duration and file size
 
     put_amf_string(pb, "duration");
     flv->duration_offset= url_ftell(pb);

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 6c290d2..99f0777 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -197,7 +197,7 @@ stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
 266296 ./tests/data/a-adpcm_yam.wav
 2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.rotozoom.out.wav
 stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
-c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
+42d4639866ed4d692eaf126228a4fa2a *./tests/data/a-adpcm_swf.flv
 269166 ./tests/data/a-adpcm_swf.flv
 628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.rotozoom.out.wav
 stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444

diff --git a/tests/vsynth.regression.ref b/tests/vsynth.regression.ref
index 91264ff..dd4f473 100644 (file)
--- a/tests/vsynth.regression.ref
+++ b/tests/vsynth.regression.ref
@@ -197,7 +197,7 @@ stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
 266296 ./tests/data/a-adpcm_yam.wav
 2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.vsynth.out.wav
 stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
-c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
+42d4639866ed4d692eaf126228a4fa2a *./tests/data/a-adpcm_swf.flv
 269166 ./tests/data/a-adpcm_swf.flv
 628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.vsynth.out.wav
 stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444