Revision f3b3b489 libavcodec/libx264.c

View differences:

libavcodec/libx264.c
242 242
        x4->params.analyse.i_me_method = X264_ME_TESA;
243 243
    else x4->params.analyse.i_me_method = X264_ME_HEX;
244 244

  
245
    x4->params.rc.i_aq_mode = avctx->aq_mode;
246
    x4->params.rc.f_aq_strength = avctx->aq_strength;
247
    x4->params.rc.i_lookahead = avctx->rc_lookahead;
248

  
249
    x4->params.analyse.b_psy = avctx->flags2 & CODEC_FLAG2_PSY;
250
    x4->params.analyse.f_psy_rd = avctx->psy_rd;
251
    x4->params.analyse.f_psy_trellis = avctx->psy_trellis;
252

  
245 253
    x4->params.analyse.i_me_range         = avctx->me_range;
246 254
    x4->params.analyse.i_subpel_refine    = avctx->me_subpel_quality;
247 255

  
......
272 280
    x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
273 281

  
274 282
    x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
283
    x4->params.analyse.b_ssim = avctx->flags & CODEC_FLAG2_SSIM;
275 284
    x4->params.i_log_level    = X264_LOG_DEBUG;
276 285

  
277 286
    x4->params.b_aud          = avctx->flags2 & CODEC_FLAG2_AUD;
......
291 300

  
292 301
    if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
293 302
        x264_nal_t *nal;
294
        int nnal, s;
303
        int nnal, s, i;
295 304

  
296 305
        s = x264_encoder_headers(x4->enc, &nal, &nnal);
297 306

  
307
        for (i = 0; i < nnal; i++)
308
            if (nal[i].i_type == NAL_SEI)
309
                av_log(avctx, AV_LOG_INFO, "%s\n", nal[i].p_payload+25);
310

  
298 311
        avctx->extradata      = av_malloc(s);
299 312
        avctx->extradata_size = encode_nals(avctx, avctx->extradata, s, nal, nnal, 1);
300 313
    }

Also available in: Unified diff