Revision d0df2934

View differences:

libavcodec/pthread.c
877 877
        avctx->active_thread_type = 0;
878 878
    } else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) {
879 879
        avctx->active_thread_type = FF_THREAD_FRAME;
880
    } else {
880
    } else if (avctx->thread_type & FF_THREAD_SLICE) {
881 881
        avctx->active_thread_type = FF_THREAD_SLICE;
882 882
    }
883 883
}

Also available in: Unified diff