diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2004-09-03 02:32:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-03 02:32:39 +0000 |
| commit | 952b32c0ad8b8ce4dba9707b1e0a25a220783700 (patch) | |
| tree | 29649a9e5b99da0b77a98b79f92ef4fdc19b1048 | |
| parent | 3cb018726ccc15ac09e60199d54aed78d53491e3 (diff) | |
| download | ffmpeg-952b32c0ad8b8ce4dba9707b1e0a25a220783700.tar.gz | |
Always write VOL control parameters, needed by old xvid patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3432 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 12 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 10 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 12 |
3 files changed, 15 insertions, 19 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index c82c15e965..3eec00504c 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -2226,14 +2226,10 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); } - if(s->low_delay){ - put_bits(&s->pb, 1, 1); /* vol control parameters= yes */ - put_bits(&s->pb, 2, 1); /* chroma format YUV 420/YV12 */ - put_bits(&s->pb, 1, s->low_delay); - put_bits(&s->pb, 1, 0); /* vbv parameters= no */ - }else{ - put_bits(&s->pb, 1, 0); /* vol control parameters= no */ - } + put_bits(&s->pb, 1, 1); /* vol control parameters= yes */ + put_bits(&s->pb, 2, 1); /* chroma format YUV 420/YV12 */ + put_bits(&s->pb, 1, s->low_delay); + put_bits(&s->pb, 1, 0); /* vbv parameters= no */ put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */ put_bits(&s->pb, 1, 1); /* marker bit */ diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index d26dc61966..5b2a90b673 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -51,20 +51,20 @@ stddev: 7.99 PSNR:30.06 bytes:7602176 5986168 ./data/a-huffyuv.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -3fd26e006c383314e731eabfd68d4536 *./data/a-mpeg4-rc.avi -820960 ./data/a-mpeg4-rc.avi +788092f090eb1b11b78369f83e430fba *./data/a-mpeg4-rc.avi +820964 ./data/a-mpeg4-rc.avi 8458b4ddaca643a3ec1264c1ee2f4986 *./data/out.yuv stddev: 10.41 PSNR:27.77 bytes:7602176 7aab4613f634d23b6c66eec7270baaff *./data/a-mpeg4-adv.avi 600240 ./data/a-mpeg4-adv.avi 0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv stddev: 10.25 PSNR:27.90 bytes:7602176 -d1fa3d096b339d68200c67a71e710798 *./data/a-mpeg4-thread.avi +0000cc8c66f88d0e25ecdd63e85e457a *./data/a-mpeg4-thread.avi 756550 ./data/a-mpeg4-thread.avi 7e4e2cf2659aa158f5ffed2be45a9c3d *./data/out.yuv stddev: 12.31 PSNR:26.31 bytes:7602176 -8d517c0cf195570f6ac08914ed6c07b8 *./data/a-mpeg4-Q.avi -899508 ./data/a-mpeg4-Q.avi +545245d3169814f03dad599cac4b9ada *./data/a-mpeg4-Q.avi +899514 ./data/a-mpeg4-Q.avi cdb77818e108eab89c9ac4bcaf350e19 *./data/out.yuv stddev: 5.69 PSNR:33.00 bytes:7602176 f28aea7181f680687ea9522f0066d18a *./data/a-error-mpeg4-adv.avi diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 22a596a034..592c160529 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -51,20 +51,20 @@ stddev: 5.34 PSNR:33.56 bytes:7602176 4987020 ./data/a-huffyuv.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -ad386d2b05f50bf2b4f922c9970455cb *./data/a-mpeg4-rc.avi -228092 ./data/a-mpeg4-rc.avi +e9ce342786f760b8e0a62a8fb2601628 *./data/a-mpeg4-rc.avi +228094 ./data/a-mpeg4-rc.avi 764d5da4f1c8eda9bd554179ed1ea283 *./data/out.yuv stddev: 4.26 PSNR:35.51 bytes:7602176 f5e3b1dc7fbfe47fd1354cb620825000 *./data/a-mpeg4-adv.avi 172538 ./data/a-mpeg4-adv.avi 49fecc1105d25ff1c2fc9c0d4cb821b0 *./data/out.yuv stddev: 4.84 PSNR:34.41 bytes:7602176 -04f280768c952362c366a711f0648b7a *./data/a-mpeg4-thread.avi -253092 ./data/a-mpeg4-thread.avi +525aee25f7aed5566ac2a887190cda93 *./data/a-mpeg4-thread.avi +253098 ./data/a-mpeg4-thread.avi da1a5a3301ad2bdf5806a51ffa74d4fb *./data/out.yuv stddev: 4.06 PSNR:35.93 bytes:7602176 -7e6d45149272eee543612f117af6e61a *./data/a-mpeg4-Q.avi -165012 ./data/a-mpeg4-Q.avi +79204f01954362d779e1e078365d3c31 *./data/a-mpeg4-Q.avi +165016 ./data/a-mpeg4-Q.avi 94d8bd3897ac20bb3bef9cf384f9abd0 *./data/out.yuv stddev: 4.01 PSNR:36.05 bytes:7602176 24f27c7781eb2d4f644f031d3f852686 *./data/a-error-mpeg4-adv.avi |