Revision 01418506

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);
libavcodec/h264.c
7461 7461
        }
7462 7462

  
7463 7463
        avctx->execute(avctx, (void *)decode_slice,
7464
                       (void **)h->thread_context, NULL, context_count, sizeof(void*));
7464
                       h->thread_context, NULL, context_count, sizeof(void*));
7465 7465

  
7466 7466
        /* pull back stuff from slices to master context */
7467 7467
        hx = h->thread_context[context_count - 1];
libavcodec/mpeg12.c
2309 2309
                if(avctx->thread_count > 1){
2310 2310
                    int i;
2311 2311

  
2312
                    avctx->execute(avctx, slice_decode_thread,  (void**)&(s2->thread_context[0]), NULL, s->slice_count, sizeof(void*));
2312
                    avctx->execute(avctx, slice_decode_thread,  &s2->thread_context[0], NULL, s->slice_count, sizeof(void*));
2313 2313
                    for(i=0; i<s->slice_count; i++)
2314 2314
                        s2->error_count += s2->thread_context[i]->error_count;
2315 2315
                }
libavcodec/mpegvideo_enc.c
2772 2772
        s->lambda2= (s->lambda2* (int64_t)s->avctx->me_penalty_compensation + 128)>>8;
2773 2773
        if(s->pict_type != FF_B_TYPE && s->avctx->me_threshold==0){
2774 2774
            if((s->avctx->pre_me && s->last_non_b_pict_type==FF_I_TYPE) || s->avctx->pre_me==2){
2775
                s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count, sizeof(void*));
2775
                s->avctx->execute(s->avctx, pre_estimate_motion_thread, &s->thread_context[0], NULL, s->avctx->thread_count, sizeof(void*));
2776 2776
            }
2777 2777
        }
2778 2778

  
2779
        s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count, sizeof(void*));
2779
        s->avctx->execute(s->avctx, estimate_motion_thread, &s->thread_context[0], NULL, s->avctx->thread_count, sizeof(void*));
2780 2780
    }else /* if(s->pict_type == FF_I_TYPE) */{
2781 2781
        /* I-Frame */
2782 2782
        for(i=0; i<s->mb_stride*s->mb_height; i++)
......
2784 2784

  
2785 2785
        if(!s->fixed_qscale){
2786 2786
            /* finding spatial complexity for I-frame rate control */
2787
            s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count, sizeof(void*));
2787
            s->avctx->execute(s->avctx, mb_var_thread, &s->thread_context[0], NULL, s->avctx->thread_count, sizeof(void*));
2788 2788
        }
2789 2789
    }
2790 2790
    for(i=1; i<s->avctx->thread_count; i++){
......
2924 2924
    for(i=1; i<s->avctx->thread_count; i++){
2925 2925
        update_duplicate_context_after_me(s->thread_context[i], s);
2926 2926
    }
2927
    s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count, sizeof(void*));
2927
    s->avctx->execute(s->avctx, encode_thread, &s->thread_context[0], NULL, s->avctx->thread_count, sizeof(void*));
2928 2928
    for(i=1; i<s->avctx->thread_count; i++){
2929 2929
        merge_context_after_encode(s, s->thread_context[i]);
2930 2930
    }

Also available in: Unified diff