diff options
author | Justin Ruggles <jruggle@earthlink.net> | 2005-05-05 14:10:52 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-05 14:10:52 +0000 |
commit | 132041f06fe30eff483769e19681bb2d5f92f26c (patch) | |
tree | dba3720b1e7a6f3e5f11e76ec40f2918b380e016 /tests | |
parent | 725de25c4c1d0db8d3bd1abc27db0bbba274cb1d (diff) | |
download | ffmpeg-132041f06fe30eff483769e19681bb2d5f92f26c.tar.gz |
While adding stereo rematrixing, I came across something that needs to
be fixed even without adding the feature. The output correctly uses 4
dummy values for the rematrixing flags in block-0, but the bit
allocation routine does not take these bits into account. From what I
can tell, there was a patch in 2003 that corrected the output to make it
DVD and spec compatible, but it didn't correct the bit allocation. It's
only 4 bits over the entire 6 blocks, so overflow errors would happen
rarely or never, but it's still worth fixing. So here is a fix.
patch by (Justin Ruggles {jruggle earthlink net)
Originally committed as revision 4179 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ffmpeg.regression.ref | 2 | ||||
-rw-r--r-- | tests/rotozoom.regression.ref | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index f3809b0f99..96285aa089 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -136,7 +136,7 @@ stddev: 10.99 PSNR:27.30 bytes:7602176 6956f2c5185c4edbae648c614992a14b *./data/out.wav stddev:9330.70 PSNR:16.92 bytes:527360 stddev:4396.13 PSNR:23.46 bytes:526336 -d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm +3bc982921d6354be383ba37c1dbcf958 *./data/a-ac3.rm 97983 ./data/a-ac3.rm 9e6e66847a568ef4f1f229b0939d2aae *./data/a-g726.wav 24268 ./data/a-g726.wav diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 540f4176fc..0eff4aaa06 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -136,7 +136,7 @@ stddev: 3.43 PSNR:37.39 bytes:7602176 6956f2c5185c4edbae648c614992a14b *./data/out.wav stddev:9330.70 PSNR:16.92 bytes:527360 stddev:4396.13 PSNR:23.46 bytes:526336 -d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm +3bc982921d6354be383ba37c1dbcf958 *./data/a-ac3.rm 97983 ./data/a-ac3.rm 9e6e66847a568ef4f1f229b0939d2aae *./data/a-g726.wav 24268 ./data/a-g726.wav |