diff options
| author | Yoshihisa Uchida <yoshihisa.uchida@gmail.com> | 2009-06-20 12:52:48 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-20 12:52:48 +0000 |
| commit | 3f3f3ba799587cfd27d6011b19784bc30864b32f (patch) | |
| tree | 02a15f52e391b3270c1d9d2f242dc6cad5585a02 | |
| parent | 4c7615c40e91c34fe42d71d734d8701f37be2c07 (diff) | |
| download | ffmpeg-3f3f3ba799587cfd27d6011b19784bc30864b32f.tar.gz | |
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
| -rw-r--r-- | libavformat/flvenc.c | 2 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 2 | ||||
| -rw-r--r-- | tests/vsynth.regression.ref | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 63accbb0cb..3ca1874cf1 100644 --- 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 6c290d2718..99f077725f 100644 --- 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 91264ff91a..dd4f4733c9 100644 --- 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 |