comparison mpeg12.c @ 2270:21f450be6cb5 libavcodec

lowres width/height cleanup 3rd try

2269:535b7dfee202

    MpegEncContext *s = &s1->mpeg_enc_ctx;
    uint8_t old_permutation[64];

    if (
    	(s1->mpeg_enc_ctx_allocated == 0)|| 
        avctx->width  != -((-s->width )>>avctx->lowres) ||
        avctx->height != -((-s->height)>>avctx->lowres) ||
//      s1->save_aspect_info != avctx->aspect_ratio_info||
        0)
    {
    
        if (s1->mpeg_enc_ctx_allocated) {

        }

	if( (s->width == 0 )||(s->height == 0))
	    return -2;

        avctx->width  = -((-s->width )>>avctx->lowres);
        avctx->height = -((-s->height)>>avctx->lowres);
        avctx->bit_rate = s->bit_rate;
        s1->save_aspect_info = s->aspect_ratio_info;

     //low_delay may be forced, in this case we will have B frames
     //that behave like P frames

    /* start new mpeg1 context decoding */
    s->out_format = FMT_MPEG1;
    if (s1->mpeg_enc_ctx_allocated) {
        MPV_common_end(s);
    }
    s->width = avctx->width;
    s->height = avctx->height;
    avctx->has_b_frames= 0; //true?
    s->low_delay= 1;

    if(avctx->xvmc_acceleration){
        avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);

2270:21f450be6cb5

    MpegEncContext *s = &s1->mpeg_enc_ctx;
    uint8_t old_permutation[64];

    if (
    	(s1->mpeg_enc_ctx_allocated == 0)|| 
        avctx->coded_width  != s->width ||
        avctx->coded_height != s->height||
//      s1->save_aspect_info != avctx->aspect_ratio_info||
        0)
    {
    
        if (s1->mpeg_enc_ctx_allocated) {

        }

	if( (s->width == 0 )||(s->height == 0))
	    return -2;

        avcodec_set_dimensions(avctx, s->width, s->height);
        avctx->bit_rate = s->bit_rate;
        s1->save_aspect_info = s->aspect_ratio_info;

     //low_delay may be forced, in this case we will have B frames
     //that behave like P frames

    /* start new mpeg1 context decoding */
    s->out_format = FMT_MPEG1;
    if (s1->mpeg_enc_ctx_allocated) {
        MPV_common_end(s);
    }
    s->width  = avctx->coded_width;
    s->height = avctx->coded_height;
    avctx->has_b_frames= 0; //true?
    s->low_delay= 1;

    if(avctx->xvmc_acceleration){
        avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);