Revision 01418506 libavcodec/dnxhdenc.c

View differences:

libavcodec/dnxhdenc.c
528 528

  
529 529
    for (q = 1; q < avctx->qmax; q++) {
530 530
        ctx->qscale = q;
531
        avctx->execute(avctx, dnxhd_calc_bits_thread, (void**)&ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
531
        avctx->execute(avctx, dnxhd_calc_bits_thread, &ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
532 532
    }
533 533
    up_step = down_step = 2<<LAMBDA_FRAC_BITS;
534 534
    lambda = ctx->lambda;
......
608 608
        bits = 0;
609 609
        ctx->qscale = qscale;
610 610
        // XXX avoid recalculating bits
611
        ctx->m.avctx->execute(ctx->m.avctx, dnxhd_calc_bits_thread, (void**)&ctx->thread[0], NULL, ctx->m.avctx->thread_count, sizeof(void*));
611
        ctx->m.avctx->execute(ctx->m.avctx, dnxhd_calc_bits_thread, &ctx->thread[0], NULL, ctx->m.avctx->thread_count, sizeof(void*));
612 612
        for (y = 0; y < ctx->m.mb_height; y++) {
613 613
            for (x = 0; x < ctx->m.mb_width; x++)
614 614
                bits += ctx->mb_rc[qscale][y*ctx->m.mb_width+x].bits;
......
732 732
    }
733 733
    if (!ret) {
734 734
        if (RC_VARIANCE)
735
            avctx->execute(avctx, dnxhd_mb_var_thread, (void**)&ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
735
            avctx->execute(avctx, dnxhd_mb_var_thread, &ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
736 736
        radix_sort(ctx->mb_cmp, ctx->m.mb_num);
737 737
        for (x = 0; x < ctx->m.mb_num && max_bits > ctx->frame_bits; x++) {
738 738
            int mb = ctx->mb_cmp[x].mb;
......
804 804
        assert(!(ctx->slice_size[i] & 3));
805 805
    }
806 806

  
807
    avctx->execute(avctx, dnxhd_encode_thread, (void**)&ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
807
    avctx->execute(avctx, dnxhd_encode_thread, &ctx->thread[0], NULL, avctx->thread_count, sizeof(void*));
808 808

  
809 809
    assert(640 + offset + 4 <= ctx->cid_table->coding_unit_size);
810 810
    memset(buf + 640 + offset, 0, ctx->cid_table->coding_unit_size - 4 - offset - 640);

Also available in: Unified diff