diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-22 23:22:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-22 23:22:08 +0000 |
| commit | 11ce88346b1ae4da21b581baf1b4eb784d842547 (patch) | |
| tree | bffaf9c06980445db1dc0cf44399526faee72316 /libavcodec/h263.c | |
| parent | c5b1c10a0e1ed783674b24d787797ffba9bdffc0 (diff) | |
| download | ffmpeg-11ce88346b1ae4da21b581baf1b4eb784d842547.tar.gz | |
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
experimental (& faster) motion estimation
squished a dirty uninitialized var bug
mpeg1 fcode>1 support
Originally committed as revision 349 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 60baedb47f..c4110726ad 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -781,7 +781,10 @@ static void mpeg4_encode_vol_header(MpegEncContext * s) put_bits(&s->pb, 1, 1); /* is obj layer id= yes */ put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */ put_bits(&s->pb, 3, 1); /* is obj layer priority */ - put_bits(&s->pb, 4, 1); /* aspect ratio info= sqare pixel */ //FIXME real aspect + if(s->aspect_ratio_info) + put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */ + else + put_bits(&s->pb, 4, 1); /* aspect ratio info= sqare pixel */ put_bits(&s->pb, 1, 0); /* vol control parameters= no */ put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */ put_bits(&s->pb, 1, 1); /* marker bit */ @@ -2149,6 +2152,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s) skip_bits(&s->gb, 8); //par_width skip_bits(&s->gb, 8); // par_height } + if(get_bits1(&s->gb)){ /* vol control parameter */ printf("vol control parameter not supported\n"); return -1; @@ -2388,7 +2392,6 @@ int mpeg4_decode_picture_header(MpegEncContext * s) //printf("b-code %d\n", s->b_code); } //printf("quant:%d fcode:%d\n", s->qscale, s->f_code); - if(!s->scalability){ if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) { skip_bits1(&s->gb); // vop shape coding type |