Fix onMetaData property count in flv files (issue 1206).
authorYoshihisa Uchida <yoshihisa.uchida@gmail.com>
Sat, 20 Jun 2009 12:52:48 +0000 (12:52 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sat, 20 Jun 2009 12:52:48 +0000 (12:52 +0000)
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

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

libavformat/flvenc.c
tests/rotozoom.regression.ref
tests/vsynth.regression.ref

index 63accbb0cb00adad29cfa99aec998252b5639599..3ca1874cf1e122972ae2fd84a02742156a2754c2 100644 (file)
@@ -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);
index 6c290d27187de0dfd2330b1b0d3e37d702e545cb..99f077725f36ede8a7b45244bd3a096ef91c54ee 100644 (file)
@@ -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
index 91264ff91ac623b57925a6e97f37325be9207fd0..dd4f4733c918816c622fdff8d4fcdeb7bd330034 100644 (file)
@@ -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