Ticket #18747: patch-libavcodec_libx264.c.diff

File patch-libavcodec_libx264.c.diff, 1.2 KB (added by simon@…, 16 years ago)
  • libavcodec/libx264.c

    old new  
    124124{
    125125    X264Context *x4 = avctx->priv_data;
    126126
     127    av_freep(&avctx->extradata);
     128
    127129    if(x4->enc)
    128130        x264_encoder_close(x4->enc);
    129131
     
    162164
    163165    x4->params.i_bframe = avctx->max_b_frames;
    164166    x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
    165     x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
     167    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
    166168    x4->params.i_bframe_bias = avctx->bframebias;
    167169    x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
    168170    avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
     
    227229    x4->params.analyse.i_me_range = avctx->me_range;
    228230    x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
    229231
    230     x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
    231     x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
    232232    x4->params.analyse.b_mixed_references =
    233233        avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
    234234    x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;