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 /libavcodec/h263.c | |
| parent | 3cb018726ccc15ac09e60199d54aed78d53491e3 (diff) | |
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
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 12 |
1 files changed, 4 insertions, 8 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 */ |