Revision 11ce8834 libavcodec/h263.c

View differences:

libavcodec/h263.c
781 781
    put_bits(&s->pb, 1, 1);		/* is obj layer id= yes */
782 782
      put_bits(&s->pb, 4, vo_ver_id);	/* is obj layer ver id */
783 783
      put_bits(&s->pb, 3, 1);		/* is obj layer priority */
784
    put_bits(&s->pb, 4, 1);		/* aspect ratio info= sqare pixel */ //FIXME real aspect
784
    if(s->aspect_ratio_info) 
785
        put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
786
    else
787
        put_bits(&s->pb, 4, 1);		/* aspect ratio info= sqare pixel */
785 788
    put_bits(&s->pb, 1, 0);		/* vol control parameters= no */
786 789
    put_bits(&s->pb, 2, RECT_SHAPE);	/* vol shape= rectangle */
787 790
    put_bits(&s->pb, 1, 1);		/* marker bit */
......
2149 2152
            skip_bits(&s->gb, 8); //par_width
2150 2153
            skip_bits(&s->gb, 8); // par_height
2151 2154
        }
2155

  
2152 2156
        if(get_bits1(&s->gb)){ /* vol control parameter */
2153 2157
            printf("vol control parameter not supported\n");
2154 2158
            return -1;   
......
2388 2392
//printf("b-code %d\n", s->b_code);
2389 2393
         }
2390 2394
//printf("quant:%d fcode:%d\n", s->qscale, s->f_code);
2391

  
2392 2395
         if(!s->scalability){
2393 2396
             if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) {
2394 2397
                 skip_bits1(&s->gb); // vop shape coding type

Also available in: Unified diff