Mercurial > libavcodec.hg
diff h263.c @ 281:1fc96b02142e libavcodec
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
experimental (& faster) motion estimation
squished a dirty uninitialized var bug
mpeg1 fcode>1 support
author | michaelni |
---|---|
date | Fri, 22 Mar 2002 23:22:08 +0000 |
parents | 6a5293bc8089 |
children | d94f9f58a2c5 |
line wrap: on
line diff
--- a/h263.c Fri Mar 22 16:51:44 2002 +0000 +++ b/h263.c Fri Mar 22 23:22:08 2002 +0000 @@ -781,7 +781,10 @@ 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 @@ 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 @@ //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