Revision e769f053

View differences:

libavcodec/avcodec.h
152 152
#define FF_ASPECT_4_3_525 3
153 153
#define FF_ASPECT_16_9_625 4
154 154
#define FF_ASPECT_16_9_525 5
155
#define FF_ASPECT_EXTENDED 15
155 156
    int gop_size; /* 0 = intra only */
156 157
    enum PixelFormat pix_fmt;  /* pixel format, see PIX_FMT_xxx */
157 158
    int repeat_pict; /* when decoding, this signal how much the picture */
......
304 305
    float i_quant_offset;/* qscale offset between i and p frames */
305 306
    float rc_initial_cplx;
306 307

  
308
    int aspected_width;
309
    int aspected_height;
310

  
307 311
    //FIXME this should be reordered after kabis API is finished ...
308 312
    //TODO kill kabi
309 313
    /*
......
334 338
	    uc_res6,uc_res7,uc_res8,uc_res9,uc_res10,uc_res11,uc_res12;
335 339
    unsigned int
336 340
	    ui_res0,ui_res1,ui_res2,ui_res3,ui_res4,ui_res5,ui_res6,ui_res7,ui_res8,ui_res9,
337
	    ui_res10,ui_res11,ui_res12,ui_res13,ui_res14,ui_res15,ui_res16,ui_res17,ui_res18,ui_res19;
341
	    ui_res10,ui_res11,ui_res12,ui_res13,ui_res14,ui_res15,ui_res16,ui_res17;
338 342
} AVCodecContext;
339 343

  
340 344
typedef struct AVCodec {
libavcodec/mpegvideo.c
382 382
    s->qblur= avctx->qblur;
383 383
    s->avctx = avctx;
384 384
    s->aspect_ratio_info= avctx->aspect_ratio_info;
385
    if (avctx->aspect_ratio_info == FF_ASPECT_EXTENDED)
386
    {
387
	s->aspected_width = avctx->aspected_width;
388
	s->aspected_height = avctx->aspected_height;
389
    }
385 390
    s->flags= avctx->flags;
386 391
    s->max_b_frames= avctx->max_b_frames;
387 392
    s->b_frame_strategy= avctx->b_frame_strategy;
libavcodec/mpegvideo.h
360 360
    int new_pred;
361 361
    int reduced_res_vop;
362 362
    int aspect_ratio_info;
363
    int aspected_width;
364
    int aspected_height;
363 365
    int sprite_warping_accuracy;
364 366
    int low_latency_sprite;
365 367
    int data_partitioning;
......
415 417
    /* [mb_intra][isChroma][level][run][last] */
416 418
    int ac_stats[2][2][MAX_LEVEL+1][MAX_RUN+1][2];
417 419
    int inter_intra_pred;
418
    
419 420

  
420 421
    /* decompression specific */
421 422
    GetBitContext gb;

Also available in: Unified diff